From patchwork Mon Jun 14 10:27:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 459828 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3190212jae; Mon, 14 Jun 2021 04:23:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwweGd5LTE1EHqFW5mVDmjQ19dCfiESVayBITmao/FLPHc6xVePOG0hbKhgwtdJLX/OL80y X-Received: by 2002:a05:6402:12d8:: with SMTP id k24mr16561116edx.47.1623669803644; Mon, 14 Jun 2021 04:23:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623669803; cv=none; d=google.com; s=arc-20160816; b=qS8hpgVYhzG0MTMChm+fVyYbQzjlXG5n9vKV7kwPa187GFH44wMLor3NPY9Yx/vC++ j7n7iXmxrbBYX2sMr9taffR0h/UEt56p6epDDpmOwacpPMa0i4eYsy4evzZTae2k9ne7 1xC6KjsvPzy7uH4hZg8O3UsmwxTnhM5H+vAAxV4aIhGtYWewBWgFXRFzGtzoTEeileAl ONzu0mdrp4tYChJtVg8Y+g7K1dnHFbSzhsEdBvPjwsm23Pm1MUdTVKgQAeQmH8t0BA+m H8O5fi6ZL+anxc4A77A+nEsjvzOmQTymQs3yMnr098WRmL/ZEd2jakTE0qXoggXxN0jx eucg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mrPtXYYbLsT2uq9daskyMwYMBLw9uZxOYehy9yg+r80=; b=Y6A7kPI1xH6TMWxaEN9IaYbKtmEMgI3+6Fyv9llQFi65ke534kDNEDBox2hNu8y8zz zqwNrpvxubZQgkq/BZyNY/PuIGBQUvIYk/Jo8R9eHy0Cn9avLusp8yg980a7qaiHQBs8 8F07a7JPHEPjriwqmJXyLPrXQcKzjz09rMoKf5d8eE97p2zE1Djot8m/2UvvJAtQoZ0b 2gwBbMzwnwoWKb9fixxzU4xbczslQJEeQB4hMwRlE4S3nUe42VmcepC1KUA8MmLCzMqH pfvAcIrTLprYasoH4kYAKJinktQMbbPAm9ObWSAnUy8q1Rj64hGl4F9X7tR2eidGz7aL 8DHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CroXMXIq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l18si11240982ejq.514.2021.06.14.04.23.23; Mon, 14 Jun 2021 04:23:23 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CroXMXIq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233510AbhFNLZP (ORCPT + 12 others); Mon, 14 Jun 2021 07:25:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:50484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235540AbhFNLWW (ORCPT ); Mon, 14 Jun 2021 07:22:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 668F66147D; Mon, 14 Jun 2021 10:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667966; bh=BowvD/eSCy3QX3Vc3LZAqN1yb6cnkXLJ8emSXKqQH6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CroXMXIqgkPBWYXu6JcT9OMQyKap8eCLRf5Gw7BcRZU0rMFhE1F8Tdx2N8fQIuXzk nqmrr4fgy3SkAnWCBuPSBts2Q4AexzoeaqeWmTDajTy63KAl8iswY+1a12Gw1Vscvf yoMN6eWtrtrfGblJNKb95RAAzsvevBpW47AZxoHk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Masami Hiramatsu , Zhen Lei , "Steven Rostedt (VMware)" Subject: [PATCH 5.12 144/173] tools/bootconfig: Fix error return code in apply_xbc() Date: Mon, 14 Jun 2021 12:27:56 +0200 Message-Id: <20210614102702.950550025@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102658.137943264@linuxfoundation.org> References: <20210614102658.137943264@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei commit e8ba0b2b64126381643bb50df3556b139a60545a upstream. Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Link: https://lkml.kernel.org/r/20210508034216.2277-1-thunder.leizhen@huawei.com Fixes: a995e6bc0524 ("tools/bootconfig: Fix to check the write failure correctly") Reported-by: Hulk Robot Acked-by: Masami Hiramatsu Signed-off-by: Zhen Lei Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- tools/bootconfig/main.c | 1 + 1 file changed, 1 insertion(+) --- a/tools/bootconfig/main.c +++ b/tools/bootconfig/main.c @@ -399,6 +399,7 @@ static int apply_xbc(const char *path, c } /* TODO: Ensure the @path is initramfs/initrd image */ if (fstat(fd, &stat) < 0) { + ret = -errno; pr_err("Failed to get the size of %s\n", path); goto out; }