From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2214042-1523981209-2-1800107464259614132 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523981209; b=dMShDsu/1GJE1k/EWdFqpfzGp2Hs+wmslYqUO841VtfeNKFsVC 0qC24OayYVDRtCCO/EgjFNuBqqgi1VGydV4X863bPtJO2RKYU1SHVxd/e3LH9t0R z7U56FiDEYc3fJvcn/CFp9uOJldP3dyXz55v1WvhWdDJFfgoLlG+cduNqPzVifQT cMRQDtG33VbncobO9PaIoXUODEU2m1aDE8IlIyHL5muUqKnDpblTiiaBeu9/w6cc UK2GJ9AYBRP5wLkBO2eh7BLS2S98I83Xcs7zPLfJmdSRVsk3Z4Sowd0kUOefmCW6 uSBUdgFGROOdfg1waR5bxjFQ2bgRG1Lp5lhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523981209; bh=FLOxsS/CY9dWJk/lasZNlY+CVQjvfN J0PRfsc3BcRGs=; b=pO65GGdZij2tQ7up+fM79WyGawOoRc4G5roKD09XKCTLEP jbB7CgsWNoRK2/H6elGfrr5uX0O11TeQjbCTzQLh/jHKfUL4stc0TpNAT10g3T13 QKEDkpFnmV1mm0GLYPO6YTOpHrVdoaObdjK4r5iCkKujqH4SUo/ll1/gkOm36HGp XMhkixTMf4LQVSxQVTTrqOsdOe/T/yIbxiygEq1ZfQoKNBnhcfy2JYotorjZfXi4 blpL26z7j+ZMxRN5HXg3DBTWQa1+B3AWE+t7qqP3I9/qiuQSxPGaknpy+6HYVxET 4VeQwiLC6UC8n+5xBcRyoQKDY3qmMStp6NsVT1vA== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfI/9/eogSVNEBtKwu8mtY/hDU6KOEDlIO/Q3d5KjzIoClz+51e6K0hN5vjOx1JBYgxxyLdfQAxI9IvnZrrpymAe3b0DdINX6e7QEPRJLbuDorCTFqz7H LdjpG8YVwoz5d/hLjKmDWMz13dZOJFptSRMTLZ6tsRomTo89HBpk3QYBtYxZSHQ11Vkj/YV9sVR/KEycpsUPQwsGRhAmuOd6OKO1dQ9muVXuDFMpn3nZ3YJl X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=WFZIRff2AAAA:8 a=J1Y8HTJGAAAA:8 a=ag1SF4gXAAAA:8 a=s6jaqUFqpbjo0NHz2EsA:9 a=eq9Yjt2k_Wljr04_:21 a=ZSLHK6p4wIhUSrHV:21 a=QEXdDO2ut3YA:10 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755013AbeDQQGo (ORCPT ); Tue, 17 Apr 2018 12:06:44 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34862 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754017AbeDQQGm (ORCPT ); Tue, 17 Apr 2018 12:06:42 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Elwell , "David S. Miller" Subject: [PATCH 4.14 07/49] lan78xx: Correctly indicate invalid OTP Date: Tue, 17 Apr 2018 17:58:46 +0200 Message-Id: <20180417155715.365754676@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417155715.032245882@linuxfoundation.org> References: <20180417155715.032245882@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Phil Elwell [ Upstream commit 4bfc33807a9a02764bdd1e42e794b3b401240f27 ] lan78xx_read_otp tries to return -EINVAL in the event of invalid OTP content, but the value gets overwritten before it is returned and the read goes ahead anyway. Make the read conditional as it should be and preserve the error code. Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver") Signed-off-by: Phil Elwell Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/lan78xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -928,7 +928,8 @@ static int lan78xx_read_otp(struct lan78 offset += 0x100; else ret = -EINVAL; - ret = lan78xx_read_raw_otp(dev, offset, length, data); + if (!ret) + ret = lan78xx_read_raw_otp(dev, offset, length, data); } return ret;