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,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 08B4AC43381 for ; Mon, 18 Feb 2019 14:10:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8589217D9 for ; Mon, 18 Feb 2019 14:10:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499014; bh=iNGHM2jaj10yLiObvsYmeNxPDZDdk4m5BJ21yZnl3j8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lgSDrKSFnyl4jkD4r6W5RBbPR6557hC+RUe1QPCirLLXfG8h2SwioFyCUg0h2z2SD uOrQMcx0lyL6cmUjDSbzIyIHOENZko4einw+szblqBgmnz435i9Vp7eLHJ28CIj0bV qKf/O1zIS2KB7QU2M7F+opVxibueXypDre0xeQ7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391424AbfBROKM (ORCPT ); Mon, 18 Feb 2019 09:10:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:53886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391405AbfBROKK (ORCPT ); Mon, 18 Feb 2019 09:10:10 -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 F2D9F21901; Mon, 18 Feb 2019 14:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499009; bh=iNGHM2jaj10yLiObvsYmeNxPDZDdk4m5BJ21yZnl3j8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uSGwiHvcySt5dEtcjMUh0JTdlmiWdtNNstcudTJ1kggjbQFlfXgR8drmGVBGNNqMt vdhzn3rng6N0INqecOVkqLfmTxWrENGhGmzbZ8/tw9UwBkfOjyJ/QT+JkxqyCRQ38d WSsdP2Pl+iGTrI2fpDS5pz3+OggZgazMrxTCeSLM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Shannon Nelson , "David S. Miller" , Sasha Levin Subject: [PATCH 3.18 047/108] niu: fix missing checks of niu_pci_eeprom_read Date: Mon, 18 Feb 2019 14:43:43 +0100 Message-Id: <20190218133521.707131554@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@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 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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