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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 213B0CA9EAE for ; Tue, 29 Oct 2019 21:34:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E57FA20679 for ; Tue, 29 Oct 2019 21:34:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jJCcL1Oz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729284AbfJ2Vei (ORCPT ); Tue, 29 Oct 2019 17:34:38 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44005 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728549AbfJ2Vei (ORCPT ); Tue, 29 Oct 2019 17:34:38 -0400 Received: by mail-pf1-f196.google.com with SMTP id 3so5817pfb.10 for ; Tue, 29 Oct 2019 14:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=czQOnB8XGZh1drUQRgi49wj4hvdzWXuEnHlZa/FCwwU=; b=jJCcL1OzsUe+bTt3PewqduHXFL93EB/nCB4OSiHOVahR0Ylu4ChCUJH4ZGtQZSpHit y/K9Ro6QZlNcEtPfRnEWcEodVFKxVZYen8dfHq+uhuWXx4db3dLwXYNIzmfgTk3baazY O8GkJZ1Bkn6fMAfPcej6FxUcsb6rdVbnpzNwY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=czQOnB8XGZh1drUQRgi49wj4hvdzWXuEnHlZa/FCwwU=; b=ZzUm/OGARdSc4TDhVdMWeKf1QYcW/OBwcNeTWRiYX3s8RO0zlS/EdOhWpXcN/ABeO9 ZadidGfcGZGBOIKAa8x6WMPoZdB4khQXi1fTncCY7Gvat4LTSURwmIHrNJo3X6H0akXK xT5PYw+FEwg+K1uDvQQYw2t/VDlXSAtprg+mRtTLuy6zqNTOB+CmDQdOO+A6+pKeIIsW UmbUw7C+fcg1WhmcnCbMmz24h3F2e8oMBYOcsQzKYDHeIkCLUhOYWJZ3HONB/qlobe4B GkqnmohFybZpafAanA97L2wIpw/INffn0v3ATcm4q4vbXlb8stlYonStBarNoqZp+bhi HpJg== X-Gm-Message-State: APjAAAWlqjXb+dwKXYFTVF+pdx9ox/orGO4ngRwhkeNf2ta1/nfHcjvI CYzxcI5QRL/LVcVq1StJl5PzTQ== X-Google-Smtp-Source: APXvYqzDkl6Dlr2YTkZfRwU7n8Cd5bbpx8yPw330Hmh+iHEb7mfXtE+8pXQMv6X1a32OfqrVoZekEg== X-Received: by 2002:a63:1c4:: with SMTP id 187mr30059349pgb.57.1572384877513; Tue, 29 Oct 2019 14:34:37 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id q185sm57411pfc.153.2019.10.29.14.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2019 14:34:36 -0700 (PDT) From: Kees Cook To: Christoph Hellwig Cc: Kees Cook , Robin Murphy , Laura Abbott , Marek Szyprowski , Jesper Dangaard Brouer , Allison Randal , Greg Kroah-Hartman , Thomas Gleixner , Stephen Boyd , Dan Carpenter , Semmle Security Reports , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/2] usb: core: Remove redundant vmap checks Date: Tue, 29 Oct 2019 14:34:23 -0700 Message-Id: <20191029213423.28949-3-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191029213423.28949-1-keescook@chromium.org> References: <20191029213423.28949-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the vmap area checks are being performed in the DMA infrastructure directly, there is no need to repeat them in USB. Signed-off-by: Kees Cook --- drivers/usb/core/hcd.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index f225eaa98ff8..281568d464f9 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1410,10 +1410,7 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, if (hcd->self.uses_pio_for_control) return ret; if (hcd_uses_dma(hcd)) { - if (is_vmalloc_addr(urb->setup_packet)) { - WARN_ONCE(1, "setup packet is not dma capable\n"); - return -EAGAIN; - } else if (object_is_on_stack(urb->setup_packet)) { + if (object_is_on_stack(urb->setup_packet)) { WARN_ONCE(1, "setup packet is on stack\n"); return -EAGAIN; } @@ -1479,9 +1476,6 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, ret = -EAGAIN; else urb->transfer_flags |= URB_DMA_MAP_PAGE; - } else if (is_vmalloc_addr(urb->transfer_buffer)) { - WARN_ONCE(1, "transfer buffer not dma capable\n"); - ret = -EAGAIN; } else if (object_is_on_stack(urb->transfer_buffer)) { WARN_ONCE(1, "transfer buffer is on stack\n"); ret = -EAGAIN; -- 2.17.1