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.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 E1155C43387 for ; Wed, 26 Dec 2018 22:57:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E2BA2070B for ; Wed, 26 Dec 2018 22:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545865077; bh=zwSoUtDKO+6kCG6FQ3aAIfRQdXcoOMx284ILeoDPiKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=onyYWXMysP/WHdbehNe3o6dz4Ct49pVq0ltFaWLlXwy9WCJlNWrR+ve4LMhC+4LWB cAJgTojZ+RZFiK9yMVt7u0Ss4pdY+PjVxr0x9mpxa3/hOclLE2ZkoUf9vjvZcSbPEd iPjFC8q5ep4wyod4Qm/0goXV393pgvv8IeBfCKBY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730531AbeLZW54 (ORCPT ); Wed, 26 Dec 2018 17:57:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:58668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730479AbeLZW5i (ORCPT ); Wed, 26 Dec 2018 17:57:38 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7DD21218A5; Wed, 26 Dec 2018 22:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545865058; bh=zwSoUtDKO+6kCG6FQ3aAIfRQdXcoOMx284ILeoDPiKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OsWF87FApE0gM+cypp/JVNbkQ5j62PPi/4KQIGjjm+mOzM3LT6wKg5jAIizjApa38 yqhOrVZwJ3LDLyFs8250wPHs99DYBqJkuOtwqm1Ae8+WlYNAYOt5bxwbd9McHxU9yh hEtiO6Xy5hhWkf1dHlqt6jaNzgzYdOLcCzus7w/Q= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Kangjie Lu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 20/21] net: netxen: fix a missing check and an uninitialized use Date: Wed, 26 Dec 2018 17:54:58 -0500 Message-Id: <20181226225501.151365-20-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181226225501.151365-1-sashal@kernel.org> References: <20181226225501.151365-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kangjie Lu [ 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