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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA11BC433EF for ; Mon, 29 Nov 2021 10:46:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353650AbhK2KtV (ORCPT ); Mon, 29 Nov 2021 05:49:21 -0500 Received: from so254-9.mailgun.net ([198.61.254.9]:60427 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344070AbhK2KrV (ORCPT ); Mon, 29 Nov 2021 05:47:21 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1638182644; h=Date: Message-ID: Cc: To: References: In-Reply-To: From: Subject: Content-Transfer-Encoding: MIME-Version: Content-Type: Sender; bh=2I88Xn2Ts20lCCx2wTdYz1XRBgOWv3XNLuEXT6BszcU=; b=Ftn8HZbr5Rg/ytnq+gZPSByL5bJAt5k6msLaWVqjLZ8SKRIByI+j+8GaPvWiYH0tRkZ60Nch Jhmy/NljGUF5+sMGMtw+5ZErD9Du6blARRSMjzHh5czBnEUS16i6g6OqWbsWQn65b+PWTXBx ZMMX/JoXakl30Mjt7pT486qbMBk= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI3YTAwOSIsICJsaW51eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n03.prod.us-east-1.postgun.com with SMTP id 61a4aef36bacc185a5988641 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 29 Nov 2021 10:44:03 GMT Sender: kvalo=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 25680C43617; Mon, 29 Nov 2021 10:44:03 +0000 (UTC) Received: from tykki.adurom.net (tynnyri.adurom.net [51.15.11.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: kvalo) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5F758C4338F; Mon, 29 Nov 2021 10:44:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.codeaurora.org 5F758C4338F Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=codeaurora.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: rsi: Fix out-of-bounds read in rsi_read_pkt() From: Kalle Valo In-Reply-To: References: To: Zekun Shen Cc: bruceshenzk@gmail.com, Amitkumar Karwar , Siva Rebbagondla , "David S. Miller" , Jakub Kicinski , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, brendandg@nyu.edu User-Agent: pwcli/0.1.0-git (https://github.com/kvalo/pwcli/) Python/3.7.3 Message-ID: <163818263840.17830.8833980282419923502.kvalo@codeaurora.org> Date: Mon, 29 Nov 2021 10:44:03 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Zekun Shen wrote: > rsi_get_* functions rely on an offset variable from usb > input. The size of usb input is RSI_MAX_RX_USB_PKT_SIZE(3000), > while 2-byte offset can be up to 0xFFFF. Thus a large offset > can cause out-of-bounds read. > > The patch adds a bound checking condition when rcv_pkt_len is 0, > indicating it's USB. It's unclear whether this is triggerable > from other type of bus. The following check might help in that case. > offset > rcv_pkt_len - FRAME_DESC_SZ > > The bug is trigerrable with conpromised/malfunctioning USB devices. > I tested the patch with the crashing input and got no more bug report. > > Attached is the KASAN report from fuzzing. > > BUG: KASAN: slab-out-of-bounds in rsi_read_pkt+0x42e/0x500 [rsi_91x] > Read of size 2 at addr ffff888019439fdb by task RX-Thread/227 > > CPU: 0 PID: 227 Comm: RX-Thread Not tainted 5.6.0 #66 > Call Trace: > dump_stack+0x76/0xa0 > print_address_description.constprop.0+0x16/0x200 > ? rsi_read_pkt+0x42e/0x500 [rsi_91x] > ? rsi_read_pkt+0x42e/0x500 [rsi_91x] > __kasan_report.cold+0x37/0x7c > ? rsi_read_pkt+0x42e/0x500 [rsi_91x] > kasan_report+0xe/0x20 > rsi_read_pkt+0x42e/0x500 [rsi_91x] > rsi_usb_rx_thread+0x1b1/0x2fc [rsi_usb] > ? rsi_probe+0x16a0/0x16a0 [rsi_usb] > ? _raw_spin_lock_irqsave+0x7b/0xd0 > ? _raw_spin_trylock_bh+0x120/0x120 > ? __wake_up_common+0x10b/0x520 > ? rsi_probe+0x16a0/0x16a0 [rsi_usb] > kthread+0x2b5/0x3b0 > ? kthread_create_on_node+0xd0/0xd0 > ret_from_fork+0x22/0x40 > > Reported-by: Brendan Dolan-Gavitt > Signed-off-by: Zekun Shen Patch applied to wireless-drivers-next.git, thanks. f1cb3476e48b rsi: Fix out-of-bounds read in rsi_read_pkt() -- https://patchwork.kernel.org/project/linux-wireless/patch/YXxXS4wgu2OsmlVv@10-18-43-117.dynapool.wireless.nyu.edu/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches