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,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 B0943C282C8 for ; Mon, 28 Jan 2019 16:29:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7265E20879 for ; Mon, 28 Jan 2019 16:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692953; bh=DZZmZlH7BOrJ3Qh0NvKEhi3QVLy8c+w1I85rxD/9O7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ff9lH6BUakwqB3gw5+GrNBMTZXV5/kJloXNeWpJb3DgAdEem48EtVvwHCzKapAtw+ Ij/xJ95nglMba978vpu5ZJeIgMQ6SIEZgFt8oYiKmUEQpbo/RlQTaOz/O9etZ9i2NI 1n2EH3jqsDaMssdzIrKlPfsP0muYu1Wynv7vvM+A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390535AbfA1Q2A (ORCPT ); Mon, 28 Jan 2019 11:28:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:38440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389908AbfA1Q17 (ORCPT ); Mon, 28 Jan 2019 11:27:59 -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 0A55A2177E; Mon, 28 Jan 2019 16:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692878; bh=DZZmZlH7BOrJ3Qh0NvKEhi3QVLy8c+w1I85rxD/9O7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uX3sPQECUGj/kHwEgKMmi1fBYS/XSHgp6CI5Q0mX7/SsApTToEIzc4Lb2KHIRGpSU 6J+QYEn6d/TWei39FCn0uGUPPCdRQa1LFtQyu+X+z11y/hrLvCkOYyYXropFrgl/Sv 1hHYvpIZdRvYQMe+o9IwV1zTBALnQbrukT6qGQbQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 53/61] niu: fix missing checks of niu_pci_eeprom_read Date: Mon, 28 Jan 2019 11:26:15 -0500 Message-Id: <20190128162623.59854-53-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128162623.59854-1-sashal@kernel.org> References: <20190128162623.59854-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kangjie Lu [ Upstream commit 26fd962bde0b15e54234fe762d86bc0349df1de4 ] niu_pci_eeprom_read() may fail, so we should check its return value before using the read data. Signed-off-by: Kangjie Lu Acked-by: Shannon Nelson Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/sun/niu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 68738aa8e218..e87bded39781 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -8131,6 +8131,8 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end) start += 3; prop_len = niu_pci_eeprom_read(np, start + 4); + if (prop_len < 0) + return prop_len; err = niu_pci_vpd_get_propname(np, start + 5, namebuf, 64); if (err < 0) return err; @@ -8175,8 +8177,12 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end) netif_printk(np, probe, KERN_DEBUG, np->dev, "VPD_SCAN: Reading in property [%s] len[%d]\n", namebuf, prop_len); - for (i = 0; i < prop_len; i++) - *prop_buf++ = niu_pci_eeprom_read(np, off + i); + for (i = 0; i < prop_len; i++) { + err = niu_pci_eeprom_read(np, off + i); + if (err >= 0) + *prop_buf = err; + ++prop_buf; + } } start += len; -- 2.19.1