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=-13.5 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=unavailable 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 9CDA2C43444 for ; Fri, 11 Jan 2019 15:01:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63C0420874 for ; Fri, 11 Jan 2019 15:01:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547218882; bh=Vi3ttY5v0apsHZ+6g+znH90msY3GZnPlnenDWzmWqbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G0bKW9NFXfs1CYswnpWcdrh/4Yw5X1oHhCkUqQ0KYsZIl13l1OCbunHnYr2rJZXHf ThH+vrYHy+TBXLnPxJButGnYPh1zg62asAWtXDMiar5q7Oz3Ug3PM7S+hlbiO1tW0d NQY8sqJpm5HjxzcKqbPpbts7XRGaP5J5qvoSA99k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389369AbfAKOcO (ORCPT ); Fri, 11 Jan 2019 09:32:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:52104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389325AbfAKOcL (ORCPT ); Fri, 11 Jan 2019 09:32:11 -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 C77822063F; Fri, 11 Jan 2019 14:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217130; bh=Vi3ttY5v0apsHZ+6g+znH90msY3GZnPlnenDWzmWqbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vMUCEU0tTfdG9RgGVAm7dmLGH3ga+w7PBdkV55JVsiLtR6hybt4O0+yOaPx6A2Bnj SZwgVNzTFDEAbPHr3zYZxH1jR70mnfpagFV2xAqglIMxKalhiMtR1LwcFC0sFkNS3a oa6VUnrwV5LNOSQ8P7M5KQtlZLoc2AMWLQWiJ1Yw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 052/105] net: netxen: fix a missing check and an uninitialized use Date: Fri, 11 Jan 2019 15:14:23 +0100 Message-Id: <20190111131107.423652118@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131102.899065735@linuxfoundation.org> References: <20190111131102.899065735@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit d134e486e831defd26130770181f01dfc6195f7d ] When netxen_rom_fast_read() fails, "bios" is left uninitialized and may contain random value, thus should not be used. The fix ensures that if netxen_rom_fast_read() fails, we return "-EIO". Signed-off-by: Kangjie Lu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 3dd973475125..4b444351ab7d 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c @@ -1125,7 +1125,8 @@ netxen_validate_firmware(struct netxen_adapter *adapter) return -EINVAL; } val = nx_get_bios_version(adapter); - netxen_rom_fast_read(adapter, NX_BIOS_VERSION_OFFSET, (int *)&bios); + if (netxen_rom_fast_read(adapter, NX_BIOS_VERSION_OFFSET, (int *)&bios)) + return -EIO; if ((__force u32)val != bios) { dev_err(&pdev->dev, "%s: firmware bios is incompatible\n", fw_name[fw_type]); -- 2.19.1