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=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 6AB22C43387 for ; Fri, 11 Jan 2019 14:28:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D7C821841 for ; Fri, 11 Jan 2019 14:28:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216900; bh=EL5wzD1L/wtXIyrDN6Y6VzF+uYlEAyeCreAH0WFVtKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wUy+vlBJguEYikWgX/7CKLWZkEGvv3CLhKYqnnG0slGgKMQzLP+LvVT4qVxSOr6dv Cm7qBil+EjpnilzgebbbkWsOJaA5XFQKIs/h+FUwXwA/iCyabCJiIwHG/p9Ujsp04o BBsXaQdpaGG9vASCnGMjmAkQRXyvXQxbrRsPyeao= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388504AbfAKO2T (ORCPT ); Fri, 11 Jan 2019 09:28:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:46896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388480AbfAKO2Q (ORCPT ); Fri, 11 Jan 2019 09:28:16 -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 7D3D92063F; Fri, 11 Jan 2019 14:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216896; bh=EL5wzD1L/wtXIyrDN6Y6VzF+uYlEAyeCreAH0WFVtKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fBGkAL0xHGC+8CMdsSnN3imCnj8PvOnkN4HoX7Ox1NIvshAhmCIxFzwx+N0VZsRe+ 4Mf3sMMralMS3H50C2RTGKJY/H9WQLSDYHmK7tXR/Fvac3VuPxbIymUxp1pcK6B4TU iyA8n6dVnsoyEt+1dmhgELOjb8+3ZMZriQn9p4gM= 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.9 31/63] net: netxen: fix a missing check and an uninitialized use Date: Fri, 11 Jan 2019 15:14:34 +0100 Message-Id: <20190111131050.507450699@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131046.387528003@linuxfoundation.org> References: <20190111131046.387528003@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.9-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 7b43a3b4abdc..5cf551914767 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