From patchwork Tue Jan 9 20:56:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10153443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7184B60223 for ; Tue, 9 Jan 2018 21:05:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 654BA2040D for ; Tue, 9 Jan 2018 21:05:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53C552434C; Tue, 9 Jan 2018 21:05:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, URIBL_BLACK autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D15B72040D for ; Tue, 9 Jan 2018 21:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755114AbeAIVEj (ORCPT ); Tue, 9 Jan 2018 16:04:39 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:42904 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759590AbeAIVEW (ORCPT ); Tue, 9 Jan 2018 16:04:22 -0500 Received: by mail-pf0-f194.google.com with SMTP id d23so9443074pfe.9 for ; Tue, 09 Jan 2018 13:04:22 -0800 (PST) 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=GSrlRY/ws0P0CG02WMSvf6XhtCuKpkyRu+d0z5n0ffE=; b=aUPWZg7fE3ZoZUJC0ko6RXy8vIvUOJujorA8jrgE9XY4gr9tUR0B/4hxsnZEjpHaRH B3eEtcsDc3kGETYCKI2gnktkRuSz1DDJHAL9eqTs/UdB3W7xRoaALIjjhs8sxepEstJb 49hNvngB0nR7VjkAKeX9lGxHNvOxSXFFhQl3Q= 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=GSrlRY/ws0P0CG02WMSvf6XhtCuKpkyRu+d0z5n0ffE=; b=HK/HlyLtRpsqCwn4Z5SCfcOQzF4HylTipJEXs1vovkJZeCNbZLtmOiXuANgxZot6tB cSTIcnutkO1A/8hsld/p7gtR/JtyD+2SPu2b5gLiPaYrmWME4KSX2HSRSNwd4L91dPkK Xcfy9prEdHLF8sz9Gr619p2yIgEua6BBApOJzAceFJaqAVuHFhLn5bwb16CsAg5kvOhu pmG5rmNMM6/Qf9UfwqOQhH57ouJiRVGlLLOWkZGGaQD87mFM499Cu/U3ZdVzoxkHsmVZ j9l8tEhV2BusO9trzLn00B54XNlHGZYnwEpPUYQlxhNlDgqZiO93NewJCoQxsGaEZolr wGGw== X-Gm-Message-State: AKGB3mI2/lQJ/kd/nBqE7UYAPxIV+a8TsDTT+xHG/pu0M6Zufy5k9TFl Q40xJ9QvBPw6XOdX1hIlrKUFpg== X-Google-Smtp-Source: ACJfBosEXCJKBOEmi8mAdJHDHktPhbR5MlAFsaxnA4oiwrxBTJ4lKLYFV9M5HU7ezM57DLwcfmwXtg== X-Received: by 10.98.144.19 with SMTP id a19mr14614629pfe.139.1515531862447; Tue, 09 Jan 2018 13:04:22 -0800 (PST) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id p72sm34624870pfa.84.2018.01.09.13.04.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 13:04:21 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , linux-mm@kvack.org, Linus Torvalds , Alexander Viro , Andy Lutomirski , Christoph Hellwig , "David S. Miller" , Laura Abbott , Mark Rutland , "Martin K. Petersen" , Paolo Bonzini , Christian Borntraeger , Christoffer Dall , Dave Kleikamp , Jan Kara , Luis de Bethencourt , Marc Zyngier , Rik van Riel , Matthew Garrett , linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, netdev@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [PATCH 35/36] usercopy: Restrict non-usercopy caches to size 0 Date: Tue, 9 Jan 2018 12:56:04 -0800 Message-Id: <1515531365-37423-36-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515531365-37423-1-git-send-email-keescook@chromium.org> References: <1515531365-37423-1-git-send-email-keescook@chromium.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With all known usercopied cache whitelists now defined in the kernel, switch the default usercopy region of kmem_cache_create() to size 0. Any new caches with usercopy regions will now need to use kmem_cache_create_usercopy() instead of kmem_cache_create(). This patch is modified from Brad Spengler/PaX Team's PAX_USERCOPY whitelisting code in the last public patch of grsecurity/PaX based on my understanding of the code. Changes or omissions from the original code are mine and don't reflect the original grsecurity/PaX code. Cc: David Windsor Cc: Christoph Lameter Cc: Pekka Enberg Cc: David Rientjes Cc: Joonsoo Kim Cc: Andrew Morton Cc: linux-mm@kvack.org Signed-off-by: Kees Cook --- mm/slab_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 8ac2a6320a6c..d00cd3f0f8ac 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -532,7 +532,7 @@ struct kmem_cache * kmem_cache_create(const char *name, size_t size, size_t align, slab_flags_t flags, void (*ctor)(void *)) { - return kmem_cache_create_usercopy(name, size, align, flags, 0, size, + return kmem_cache_create_usercopy(name, size, align, flags, 0, 0, ctor); } EXPORT_SYMBOL(kmem_cache_create);