From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AD81C433DF for ; Tue, 26 May 2020 19:17:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2105208DB for ; Tue, 26 May 2020 19:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520667; bh=6s0esmbuhORqW3ghCADkZDwb2rfkAM/yLBfDpUl9yg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SBB8YBdWEILKxxcaztjijiVGFgoj64c8o6iYQ1ZpZN+00ZG2RXh6sSmuKKjcU9cv0 R34S2athfOIi42UOyZgGKYIZh09BY+rwSuE5mg9/YlQKtW2zM/h3slt9V+nHaVp7/M UdzWhxiRQrbxdqfC2a0uP95jMP7expKF3BrIBqV8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392336AbgEZTRp (ORCPT ); Tue, 26 May 2020 15:17:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:45140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404352AbgEZTOU (ORCPT ); Tue, 26 May 2020 15:14:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A407208B6; Tue, 26 May 2020 19:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520460; bh=6s0esmbuhORqW3ghCADkZDwb2rfkAM/yLBfDpUl9yg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fBn0Ip0NzVdauRNE2j5JULxu1W+4bIWT+5ocTxfMOnzZW73u8aV2pVAdzLDfD2lMN qDVarjyyP4c2MwL6koXeLX4EY5stjjoqvakL2Gf2DawgWWpfXmyHzXYnDA3uuLPws3 m/4j4e34pKYTZE9dTq45FuOxv41+1LHwXtLvrbWs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Masami Hiramatsu , "Steven Rostedt (VMware)" , Sasha Levin Subject: [PATCH 5.6 088/126] tools/bootconfig: Fix apply_xbc() to return zero on success Date: Tue, 26 May 2020 20:53:45 +0200 Message-Id: <20200526183945.367638554@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183937.471379031@linuxfoundation.org> References: <20200526183937.471379031@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt (VMware) [ Upstream commit 9d82ccda2bc5c148060543d249d54f8703741bb4 ] The return of apply_xbc() returns the result of the last write() call, which is not what is expected. It should only return zero on success. Link: https://lore.kernel.org/r/20200508093059.GF9365@kadam Fixes: 8842604446d1 ("tools/bootconfig: Fix resource leak in apply_xbc()") Reported-by: Dan Carpenter Acked-by: Masami Hiramatsu Tested-by: Masami Hiramatsu Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Sasha Levin --- tools/bootconfig/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c index 5dbe893cf00c..37fb2e85de12 100644 --- a/tools/bootconfig/main.c +++ b/tools/bootconfig/main.c @@ -310,6 +310,7 @@ int apply_xbc(const char *path, const char *xbc_path) pr_err("Failed to apply a boot config magic: %d\n", ret); goto out; } + ret = 0; out: close(fd); free(data); -- 2.25.1