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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 9D35EC4CEC4 for ; Thu, 19 Sep 2019 22:25:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7005B20678 for ; Thu, 19 Sep 2019 22:25:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931948; bh=rng0vklXFVK0a4LP4agVcs4rvO5G2fgDSggZLO0gOwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lNiGtKMj+l65uWHXC4XnzfD3kj6d9N7N14n+eQPFxWa5jDt2zZW+KYrnZFeCRLfrj QIIHUxgupY8zSkD6Flv+I7x2h4cIulE3GbQYHL05emZQWvcHqi8HLqd8Svf0IIPdih b6vS4I/GhwXGN/7DbXoXrjXrxlOb+N983AjP7k7g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405412AbfISWZn (ORCPT ); Thu, 19 Sep 2019 18:25:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:38772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405425AbfISWXN (ORCPT ); Thu, 19 Sep 2019 18:23:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 90E2C2196E; Thu, 19 Sep 2019 22:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931793; bh=rng0vklXFVK0a4LP4agVcs4rvO5G2fgDSggZLO0gOwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f5sYl+iTmXZY60q/GCJQLGlPoL/192zzni7r/MgPtwpSYFs5VMzVKYXt/i6RrS13L ZRm4uQnW5HLRc9bcgL31O5Dg6WUczQa0dp01ZojfiNkOOmydGrlmmuI+bJTdLtdNUM kJJrcFesxFonO6BE5e6ogrLNbrZMCox6jsOyqRCs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Prashant Malani , Hayes Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 42/56] r8152: Set memory to all 0xFFs on failed reg reads Date: Fri, 20 Sep 2019 00:04:23 +0200 Message-Id: <20190919214800.119555629@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214742.483643642@linuxfoundation.org> References: <20190919214742.483643642@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Prashant Malani [ Upstream commit f53a7ad189594a112167efaf17ea8d0242b5ac00 ] get_registers() blindly copies the memory written to by the usb_control_msg() call even if the underlying urb failed. This could lead to junk register values being read by the driver, since some indirect callers of get_registers() ignore the return values. One example is: ocp_read_dword() ignores the return value of generic_ocp_read(), which calls get_registers(). So, emulate PCI "Master Abort" behavior by setting the buffer to all 0xFFs when usb_control_msg() fails. This patch is copied from the r8152 driver (v2.12.0) published by Realtek (www.realtek.com). Signed-off-by: Prashant Malani Acked-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 2d83689374bbb..10dd307593e89 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -671,8 +671,11 @@ int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0), RTL8152_REQ_GET_REGS, RTL8152_REQT_READ, value, index, tmp, size, 500); + if (ret < 0) + memset(data, 0xff, size); + else + memcpy(data, tmp, size); - memcpy(data, tmp, size); kfree(tmp); return ret; -- 2.20.1