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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 92569C5CFFE for ; Tue, 11 Dec 2018 15:52:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5948F2146E for ; Tue, 11 Dec 2018 15:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543552; bh=NK1zdMCIYGJq8QTTSiH085FrNsH5/7OXUXIvdJCWzTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CKHx19SaCs0R7G44Rv+idhttetb9V662b+8AFnuL9musCetY0I3SBQVQ7yMYXyWbS q5ih9J1UNzq6tsomu+p/WYUwdMDGQicejzOWctHOS7TzbS2O6iB+tEcxBAMPLGZUhT ScBRXrZxaxt1l+TnR9utTbSwq4oaLR8+dRnq/y2U= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5948F2146E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729731AbeLKPwa (ORCPT ); Tue, 11 Dec 2018 10:52:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:41134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729718AbeLKPw1 (ORCPT ); Tue, 11 Dec 2018 10:52:27 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 2C39620855; Tue, 11 Dec 2018 15:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543546; bh=NK1zdMCIYGJq8QTTSiH085FrNsH5/7OXUXIvdJCWzTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HHJPM7KIJepdhP3KOc9hlSFby5REgYoGSn0gvmYRoeoBDa5bUnH+An0CGU4qpuoZo hJMPkU5Zf9qefZaMdQQLvxJPWs93mIhpNwKJxB9jusH4sFEvU93qbXpvh6Btd+Wijj 65xlZ4fzL64RxvdIvnYTZHz4uyGuUXKvbHnkv+xA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Sasha Levin Subject: [PATCH 4.14 06/67] test_firmware: fix error return getting clobbered Date: Tue, 11 Dec 2018 16:41:06 +0100 Message-Id: <20181211151630.689484468@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151630.378216233@linuxfoundation.org> References: <20181211151630.378216233@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 8bb0a88600f0267cfcc245d34f8c4abe8c282713 ] In the case where eq->fw->size > PAGE_SIZE the error return rc is being set to EINVAL however this is being overwritten to rc = req->fw->size because the error exit path via label 'out' is not being taken. Fix this by adding the jump to the error exit path 'out'. Detected by CoverityScan, CID#1453465 ("Unused value") Fixes: c92316bf8e94 ("test_firmware: add batched firmware tests") Signed-off-by: Colin Ian King Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- lib/test_firmware.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/test_firmware.c b/lib/test_firmware.c index e7008688769b..71d371f97138 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -838,6 +838,7 @@ static ssize_t read_firmware_show(struct device *dev, if (req->fw->size > PAGE_SIZE) { pr_err("Testing interface must use PAGE_SIZE firmware for now\n"); rc = -EINVAL; + goto out; } memcpy(buf, req->fw->data, req->fw->size); -- 2.19.1