From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2707851-1524408521-2-5428044388460829773 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= 1524408521; b=Qf034dhvIsslvfrpINT5NigaAHd5XZOtEB4yoC/2xN8MSD/FlJ Q+jldWPNZ08ka3S5S3HPjXsZLZU4OJNuuc1aNgu+dJSX3gNy6EFNzRCjKng0sALZ jV1HeT4u62D5tzB/iwBolYi+O5bc5DnyHAu4pEVsVNT9oc8zdTKDCY3H2SBQk19/ wVhMyWTZl/HFh4UsjClaGDFBn9ooRG5wjomNuw/xfvf1nXdTRaSim4SmvSCZ/VUS m+zBdyvO3g1jx2mJLjwHyEJ3Xou0w45B78R7dZueMzCzPG34+4JxG+qRy04QBBAn CqGlCuLqWhrkRlktivOhhJNyirN9SHMDo0ig== 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=1524408521; bh=fPmUWbhioPgAW4CkZgE2/3fguVzzSz jjMrbfZlIyRH8=; b=fGauvM9un1zr7TaG1eGNOB79XiQiQYS+UwME1AGP5EbC13 oPXTCL5BKJCd83fBok3BVMLEO8h5GEGml6ni4/MbSW5fGlvPH2eg0+FfGWHo2IAb 53OG9mbhfZwfSIbSYpo3gOGv3R2cK+OHmOe0i6KlKT3o8ZZ4i37gtIXJmbVw7YQF CcDLwYe/Y+YPafGMnYFbFgXmmAUMjdPNQuN2XdVriOcq9o2IAzw6iLFBPEmoRKNx +Q5glzS1OVg93Zp82tqNGvNtobttkuht3IasVs6M026O7OIrPp/RVFCKOpajXr8O h8AkFtq0f+HZLSilGihRP6zeIIazzyH1J/9DGMIg== ARC-Authentication-Results: i=1; mx5.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: mx5.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: MS4wfDAFbFyqatF055934B/KZQfjnXFINcu8H5y7aWPIU8quPbPA9biA4l2i3DJqtX7juAht3Lrz6XgAguDOstoC1BQor+JGPxzCpNWJqqtthLoLVOeAn5ow BtothxP2LHqeo87Vaw6XAfqXttlLVhj24OWBzmsJwRfAbTZDk7+AZWrBXvOp9aDfvke9C7XtDaeYKNFt9IwoLs6DCMkXNpNNl7gumzKRZQ7VT1iOXOMi7O60 X-CM-Analysis: v=2.3 cv=NPP7BXyg 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=YLo-nH-VcUlf0b2j: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 S1756860AbeDVOsi (ORCPT ); Sun, 22 Apr 2018 10:48:38 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:57052 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932188AbeDVOPw (ORCPT ); Sun, 22 Apr 2018 10:15:52 -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.4 18/97] lan78xx: Correctly indicate invalid OTP Date: Sun, 22 Apr 2018 15:52:56 +0200 Message-Id: <20180422135305.627086892@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135304.577223025@linuxfoundation.org> References: <20180422135304.577223025@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.4-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 @@ -618,7 +618,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;