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 76A5AC3A5A6 for ; Thu, 19 Sep 2019 22:09:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49C7E21927 for ; Thu, 19 Sep 2019 22:09:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568930942; bh=+N6QR9bu5djDY6gZV3nER+oMcxR9bCcZAE69E84oqV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xMgU0PHGFywmOuCHlx4yeBr+YrlwfnTjjgOAzLC9aXFKWs6vtJzz0FZ/iOQfnJHH6 VgUIH28GqAL+soXOuQiTA/reZJrbLTYdCBY7ysaIxn0hTD0Wc01fReSDrgF0PtpnUV byrynAgTIcqaCi8YHWcNj5UhK0dQmXRgs6Od1ZKE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405336AbfISWJB (ORCPT ); Thu, 19 Sep 2019 18:09:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:46862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393472AbfISWIw (ORCPT ); Thu, 19 Sep 2019 18:08:52 -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 10C3C21927; Thu, 19 Sep 2019 22:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568930931; bh=+N6QR9bu5djDY6gZV3nER+oMcxR9bCcZAE69E84oqV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qe2wjnTXPWXhGHdD9aSDZcodWMeEDcfVoL6xFLj8lu+yi2Wr384641Am+2M31mtgx K+n8Mjj+sJxOO54BHLJhyODb9Tyd0eIG3Z4R7qizhguiuXQYWEgN/UxbJgtcFcDJso 9J874IxrZ3bNhXDIXizbHYmMLl4kXnNGwJUAOxoI= 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 5.2 065/124] r8152: Set memory to all 0xFFs on failed reg reads Date: Fri, 20 Sep 2019 00:02:33 +0200 Message-Id: <20190919214821.364007359@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214819.198419517@linuxfoundation.org> References: <20190919214819.198419517@linuxfoundation.org> User-Agent: quilt/0.66 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 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 1a7b7bd412f9d..f2553dff5b178 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -787,8 +787,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