Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp130803pxk; Tue, 15 Sep 2020 23:25:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBe0cYGVXIdCUZt0CxbFOIrmWKfOyGjirU/PpilYK6AMzU4qKKZcTcCpGYbGTLgh+xlYmk X-Received: by 2002:a05:6402:3c8:: with SMTP id t8mr25198985edw.266.1600237547250; Tue, 15 Sep 2020 23:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600237547; cv=none; d=google.com; s=arc-20160816; b=rBcx3oxWO3XgKamSWOt2lI4lQKWMbBAR0TYNY5egfLdjXDF/LJ+IdUrI86IPSVnxS+ Iu9Pd08ZfNQ4/a+lXUFCnNilwtHbw3anybavMZANjyP+/qPVBifsbIX2vtMGWsQgXviO 3TVAe0oFR1liCgO6MPldGNrYCi9biZOxJULcm3WApb+iyAJa/SQL4F1dTzE5R50qvZuX CWaADJrzLoA07HRl2vtYPxQ3Po5QGEXDb/XnNrmyP6FQiDGyiPGXaiyMeZQV+7bc95jn 5A6qdQiRbfJICqSepF0hECCk+/jqDTyFd5JR6vTUHAbtth3iaAsn4cAEMNn2/YiUrcqG RM1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=VPfh9Dng3me8Lwn5/Qf3X5Oib84XMJwHHski7f5ZVpg=; b=L6GGOCN2Ex2DKp9BzOUndJ/87T47MUSK2h3HkF7UODrBrikEpncw/7kXrKMO1Znr1p /6n20WsE66G+BiWXhv9OvZzgt+38b1T4AzdnCDX1pElPowInn/k9DBMl5vVnjmJ9iqln s9Wq3BJ9cmU6nA0ims7UzGTE2IgyWPdXdXcS32w6po67f9TxIYigsN/SI94+/iDGTvP5 0AN+B691mAd3YkqkW4lSmSo6eGne+K2UFedU4ZeBeUZeut/G+PUPT5Jq8xjKPe/s7yth 54z5QSzgXJEFiw9O4YoVMpaCKzvqEHB/FbmCdEDfI+OOvjS3rvYD+ELuC9RblPrPOwic LJog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DujFdqAh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u16si11150346edr.507.2020.09.15.23.25.24; Tue, 15 Sep 2020 23:25:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DujFdqAh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726535AbgIPGWE (ORCPT + 99 others); Wed, 16 Sep 2020 02:22:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:44604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbgIPGVx (ORCPT ); Wed, 16 Sep 2020 02:21:53 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 1419A2067C; Wed, 16 Sep 2020 06:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600237312; bh=uJRg3V5jemoM77QzifyzTeMiwLxju00kO9REccN1WMY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DujFdqAhT1OQ3IRITXYlfsxdYOZL2VkULfVuEtbvzYXPW/m7rri6WMT2RUJjzFf6b eTQtttNQmPq5MX9cyCYupPwWkn9T5Q1EBSBt/mh82kezqtg+pW35+r9TK/Egnxy1F3 x/tXW4WOzOHx+Yx7GuP8z3svgmc6aeMtJvg315zo= Date: Wed, 16 Sep 2020 08:22:27 +0200 From: Greg KH To: Anant Thazhemadam Cc: linux-kernel-mentees@lists.linuxfoundation.org, syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com, Petko Manolov , "David S. Miller" , Jakub Kicinski , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [Linux-kernel-mentees][PATCH] rtl8150: set memory to all 0xFFs on failed register reads Message-ID: <20200916062227.GD142621@kroah.com> References: <20200916050540.15290-1-anant.thazhemadam@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200916050540.15290-1-anant.thazhemadam@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 16, 2020 at 10:35:40AM +0530, Anant Thazhemadam wrote: > get_registers() copies whatever memory is written by the > usb_control_msg() call even if the underlying urb call ends up failing. > > If get_registers() fails, or ends up reading 0 bytes, meaningless and > junk register values would end up being copied over (and eventually read > by the driver), and since most of the callers of get_registers() don't > check the return values of get_registers() either, this would go unnoticed. > > It might be a better idea to try and mirror the PCI master abort > termination and set memory to 0xFFs instead in such cases. It would be better to use this new api call instead of usb_control_msg(): https://lore.kernel.org/r/20200914153756.3412156-1-gregkh@linuxfoundation.org How about porting this patch to run on top of that series instead? That should make this logic much simpler. > > Fixes: https://syzkaller.appspot.com/bug?extid=abbc768b560c84d92fd3 > Reported-by: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com > Tested-by: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com > Signed-off-by: Anant Thazhemadam > --- > drivers/net/usb/rtl8150.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c > index 733f120c852b..04fca7bfcbcb 100644 > --- a/drivers/net/usb/rtl8150.c > +++ b/drivers/net/usb/rtl8150.c > @@ -162,8 +162,13 @@ static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data) > ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), > RTL8150_REQ_GET_REGS, RTL8150_REQT_READ, > indx, 0, buf, size, 500); > - if (ret > 0 && ret <= size) > + > + if (ret < 0) > + memset(data, 0xff, size); > + > + else > memcpy(data, buf, ret); > + > kfree(buf); > return ret; > } > @@ -276,7 +281,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg) > > static inline void set_ethernet_addr(rtl8150_t * dev) > { > - u8 node_id[6]; > + u8 node_id[6] = {0}; This should not be needed to be done. thanks, greg k-h