From patchwork Thu Sep 15 15:03:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 12977541 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC1C8C6FA89 for ; Thu, 15 Sep 2022 15:05:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16C6880017; Thu, 15 Sep 2022 11:05:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 11EF980007; Thu, 15 Sep 2022 11:05:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFEC380017; Thu, 15 Sep 2022 11:05:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E08AC80007 for ; Thu, 15 Sep 2022 11:05:42 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BFC64806CB for ; Thu, 15 Sep 2022 15:05:42 +0000 (UTC) X-FDA: 79914644124.15.987DEF0 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) by imf27.hostedemail.com (Postfix) with ESMTP id 6E23C4010C for ; Thu, 15 Sep 2022 15:05:42 +0000 (UTC) Received: by mail-ej1-f73.google.com with SMTP id xj11-20020a170906db0b00b0077b6ecb23fcso5864221ejb.5 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=pyn2IuMNqsdI1+p6td/gZ3venGmF5NiFtdEknR7GlGthHGyVOKSBk4wrE4Y6e4zsWA 15L8KHcNOqDke4vMXmqjsCpcAULRdyQexKPJPjQBavMBpp3ThW7CTxP5X5Nc4H7IF2y0 UBWTEbnWuBJQYR2cUUzkrxtFOd3vKQ1MnyAbTFgDOCfNSekqPFCHdhZe+Ot4Gb80fRn/ 9ncwjTlRr0jy3r5Srw0e2kIX+Zm+7UKG7cJDf3jLb8qpTZAEPHYjj8QQnVOIwe6B0D1S pwhG/FtB8J1NcKVgWwXpOcgSk1SkhPnSqppWc/+0pUzk72KCva+JP0hULRQlHsDfl0b0 t2Lg== X-Gm-Message-State: ACrzQf14ciGwzp7qhlgeGWHzdLd5gr7C+PSVi7/2Z32glX+VTdtzdbSB 0EPUuV0aDDidXr3zmFf3GyDO27BXo7o= 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663254342; a=rsa-sha256; cv=none; b=eOA8QLYeKW28KrSs6O4Zb+MXBxjwM1pGbEK76MVc9kiEc1xXXNnFYimcT8jYxKAu2eyeE2 1dXRcrsW1eaaa4B4rUiupaVTv7i4m/xFvm/JT4J0dytv5gsuTriR5AsUWEGYBZr87wt6K0 K9HflAwm/Ho7AXTqt/nK35wXpJ4dZ6Y= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=fPu7uIFt; spf=pass (imf27.hostedemail.com: domain of 3RT8jYwYKCHAUZWRSfUccUZS.QcaZWbil-aaYjOQY.cfU@flex--glider.bounces.google.com designates 209.85.218.73 as permitted sender) smtp.mailfrom=3RT8jYwYKCHAUZWRSfUccUZS.QcaZWbil-aaYjOQY.cfU@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663254342; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2KqHkwy5ct3iw6Sq4tv6KYhLxwZCRI8E9SKEfBphS/w=; b=MHVEYKfFr/fZT1uRNDGZzx2iE0gUO4hCOQ2ioFujOdRZlFByAG5Mn3YD3oraYHZicSjtu0 w65JZqJnZh3TxQq+/58Yxt7qorJg8vD6FjxF8zOaPnxbAHLptcdcH+fbSsWl6zBqXSyu9a aB7/y/dSRjel/4ZZmcFf908mTdtwEWM= Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=fPu7uIFt; spf=pass (imf27.hostedemail.com: domain of 3RT8jYwYKCHAUZWRSfUccUZS.QcaZWbil-aaYjOQY.cfU@flex--glider.bounces.google.com designates 209.85.218.73 as permitted sender) smtp.mailfrom=3RT8jYwYKCHAUZWRSfUccUZS.QcaZWbil-aaYjOQY.cfU@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: r9detafeqtmjhrbm4r6ytn17cesihntg X-Rspamd-Queue-Id: 6E23C4010C X-HE-Tag: 1663254342-780969 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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/Ifa67fb72015d4de14c30e971556f99fc8b2ee506 --- 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 |= (is_out ? URB_DIR_OUT : URB_DIR_IN); + kmsan_handle_urb(urb, is_out); if (xfertype != 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; #ifdef CONFIG_KMSAN @@ -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); +/** + * 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 static inline void kmsan_init_shadow(void) @@ -295,6 +306,10 @@ static inline void kmsan_handle_dma_sg(struct scatterlist *sg, int nents, { } +static inline void kmsan_handle_urb(const struct urb *urb, bool is_out) +{ +} + #endif #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 #include "../internal.h" #include "../slab.h" @@ -245,6 +246,21 @@ void kmsan_copy_to_user(void __user *to, const void *from, size_t to_copy, } EXPORT_SYMBOL(kmsan_copy_to_user); +/* 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) {