From nobody Fri Dec 19 19:15:27 2025 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 12F85C6FA89 for ; Thu, 15 Sep 2022 15:09:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229732AbiIOPJI (ORCPT ); Thu, 15 Sep 2022 11:09:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230490AbiIOPHc (ORCPT ); Thu, 15 Sep 2022 11:07:32 -0400 Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3D74979F1 for ; Thu, 15 Sep 2022 08:05:42 -0700 (PDT) Received: by mail-ed1-x549.google.com with SMTP id m13-20020a056402510d00b004519332f0b1so9676522edd.7 for ; Thu, 15 Sep 2022 08:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=2KqHkwy5ct3iw6Sq4tv6KYhLxwZCRI8E9SKEfBphS/w=; b=fPu7uIFtmE//tUnrLa1tnXaL06eOVtU9zQx1jD11vGKa9vrSb/SjRvfVtu20ImD2aq ktyAMM5zlghdVPv+ZNdaxRTBLC9V1FJxhA201qoYNf/tpvo/3r0+8ib6QSN3MOcY4115 spN1PPpnPtfSV6K/JJxozWg2zCM88cCSCywBiUfgKmXQbAosetv4LctjU4+UQP+iFrme 28d6xc5S+HnxO4hALfhDVVmueAJrgRI11Vk+WzMY8U4PpZ8rrLGIKkMWARAPUu2nHhEu vae6RzSCdFOZzWb8P6yu+5HmBos6yFQTgr9rKZ9cnfoNEOHUwMwWfwXrkFNReFByX/rE fe9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=2KqHkwy5ct3iw6Sq4tv6KYhLxwZCRI8E9SKEfBphS/w=; b=akHeNStoN5Tl23GVG9aqm8l+H4YIfG8YBFVoonpmrugYW9oIp7MnEfl9dGjgaG9+A1 bXWQtt8FA6OeTHbJ+mlrf19RMpaUhx+K0QDcaSKlfNbrG8S9/nI2KIpXse5IGh7WiT3w o7/CMQ/ad6TVnuceGL6l+C9qvy4PCv+8amoQ8ajglVst0neyrMGxWy5eiWI5cYO25qaM cKstje/B8RxC6ctzBL7Mwbq7NZJd5Rz+F7hvpoL+u7d0rlZDpUreKt+Zvxvo36sGfs4S bETS7rTmNr2Hj2xDdCwishZmmlEI7eMk9pNpBfsyOywF4oHeK839oMBU9dLMFh+kmltK I/tQ== X-Gm-Message-State: ACrzQf2VL/WgxNZHNppRzfeXgi5eFXwtXcax9CmTErnFz7DM7s9a8Y53 Y76xWRRE8IbKk24O3Cz1kiWf0bESBl4= X-Google-Smtp-Source: AMsMyM4HcOp+9qUt632hCRIrvaKzGPgGgVNgbAXsPiaoxZj4kxm9xBjgLt4GEuAE26rJcVwJSimZeHtdWr0= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:686d:27b5:495:85b7]) (user=glider job=sendgmr) by 2002:a17:907:2e0d:b0:77e:999f:dea3 with SMTP id ig13-20020a1709072e0d00b0077e999fdea3mr271626ejc.317.1663254341181; Thu, 15 Sep 2022 08:05:41 -0700 (PDT) Date: Thu, 15 Sep 2022 17:03:57 +0200 In-Reply-To: <20220915150417.722975-1-glider@google.com> Mime-Version: 1.0 References: <20220915150417.722975-1-glider@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220915150417.722975-24-glider@google.com> Subject: [PATCH v7 23/43] kmsan: handle memory sent to/from USB From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Biggers , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Stephen Rothwell , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Depending on the value of is_out kmsan_handle_urb() KMSAN either marks the data copied to the kernel from a USB device as initialized, or checks the data sent to the device for being initialized. Signed-off-by: Alexander Potapenko --- v2: -- move kmsan_handle_urb() implementation to this patch v5: -- do not export KMSAN hooks that are not called from modules v6: -- use instead of Link: https://linux-review.googlesource.com/id/Ifa67fb72015d4de14c30e971556= f99fc8b2ee506 --- drivers/usb/core/urb.c | 2 ++ include/linux/kmsan.h | 15 +++++++++++++++ mm/kmsan/hooks.c | 16 ++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index 33d62d7e3929f..9f3c54032556e 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -426,6 +427,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL | URB_DMA_SG_COMBINED); urb->transfer_flags |=3D (is_out ? URB_DIR_OUT : URB_DIR_IN); + kmsan_handle_urb(urb, is_out); =20 if (xfertype !=3D USB_ENDPOINT_XFER_CONTROL && dev->state < USB_STATE_CONFIGURED) diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h index dac296da45c55..c473e0e21683c 100644 --- a/include/linux/kmsan.h +++ b/include/linux/kmsan.h @@ -18,6 +18,7 @@ struct page; struct kmem_cache; struct task_struct; struct scatterlist; +struct urb; =20 #ifdef CONFIG_KMSAN =20 @@ -203,6 +204,16 @@ void kmsan_handle_dma(struct page *page, size_t offset= , size_t size, void kmsan_handle_dma_sg(struct scatterlist *sg, int nents, enum dma_data_direction dir); =20 +/** + * kmsan_handle_urb() - Handle a USB data transfer. + * @urb: struct urb pointer. + * @is_out: data transfer direction (true means output to hardware). + * + * If @is_out is true, KMSAN checks the transfer buffer of @urb. Otherwise, + * KMSAN initializes the transfer buffer. + */ +void kmsan_handle_urb(const struct urb *urb, bool is_out); + #else =20 static inline void kmsan_init_shadow(void) @@ -295,6 +306,10 @@ static inline void kmsan_handle_dma_sg(struct scatterl= ist *sg, int nents, { } =20 +static inline void kmsan_handle_urb(const struct urb *urb, bool is_out) +{ +} + #endif =20 #endif /* _LINUX_KMSAN_H */ diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c index 563c09443a37a..79d7e73e2cfd8 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -18,6 +18,7 @@ #include #include #include +#include =20 #include "../internal.h" #include "../slab.h" @@ -245,6 +246,21 @@ void kmsan_copy_to_user(void __user *to, const void *f= rom, size_t to_copy, } EXPORT_SYMBOL(kmsan_copy_to_user); =20 +/* Helper function to check an URB. */ +void kmsan_handle_urb(const struct urb *urb, bool is_out) +{ + if (!urb) + return; + if (is_out) + kmsan_internal_check_memory(urb->transfer_buffer, + urb->transfer_buffer_length, + /*user_addr*/ 0, REASON_SUBMIT_URB); + else + kmsan_internal_unpoison_memory(urb->transfer_buffer, + urb->transfer_buffer_length, + /*checked*/ false); +} + static void kmsan_handle_dma_page(const void *addr, size_t size, enum dma_data_direction dir) { --=20 2.37.2.789.g6183377224-goog