From patchwork Thu Jan 11 02:03:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156627 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 D589F605F5 for ; Thu, 11 Jan 2018 02:14:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3B112874B for ; Thu, 11 Jan 2018 02:14:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B121028751; Thu, 11 Jan 2018 02:14:10 +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 3A6472874C for ; Thu, 11 Jan 2018 02:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754125AbeAKCOG (ORCPT ); Wed, 10 Jan 2018 21:14:06 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:46681 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753832AbeAKCJn (ORCPT ); Wed, 10 Jan 2018 21:09:43 -0500 Received: by mail-pg0-f65.google.com with SMTP id r2so1601655pgq.13 for ; Wed, 10 Jan 2018 18:09:43 -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=VpNMpapfjDsWVC8x88reHR/TXC/I/w3ytSB8sLLi7ZYj8XJBIsX4MSaa8LziPirziy yqF+xVWkSfEqzym8mg9pxCyQ0RyzG3PDa5ts70wgFg2vIo6/nmtiffRGf7IRQvR+9lVr rv6kuNP2/M3KcYoqoMIvT+unQNK1QRIpTMDs8= 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=fGjXAQI7PyCn/R3ph86eQD8uVrO9cIERpioCNQcPQMwfsUelFJmEdffElaOnuC3kQU k/hU9TtaV2DxXiaX6SErqpq6H4QV5zG4ZoU/AvZJTorNwXORvuyvdIeWUyaNlGUwwNd4 v14Du8tFW+sBExbJslRfuZUpWKPIvjHJsg8DPkq7tptKSYah4LW1hcyyCU/WbOU742ZP arYacHAPQV9ITjyDmiBfQOM+XNsG2uVZzJ6Adgik2Mj17C9OB+MFNZCncY3IIzeYYgQz xHldWUT6ojyj+QMJxathp4czCLQCHh8MYM+YboDT9DRa7171M9VXlzCahbGLvAnQ/qqW /zWA== X-Gm-Message-State: AKGB3mJg+aiLqN6nz5A6BC/y7o4BJIkK98xsQolakO9zh7ctmgVKWFxQ r4Luw0iuWV4XZkqC9YlqqMU4nQ== X-Google-Smtp-Source: ACJfBoupw6w4eJ3qwDsS+mXsGe87BzpGtAVEPA8HYVg5Jnjpnsr3BfW5xeZ/0i3qq5bAJMbZQJQtug== X-Received: by 10.99.1.151 with SMTP id 145mr8077343pgb.229.1515636583132; Wed, 10 Jan 2018 18:09:43 -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 l8sm33471542pgr.49.2018.01.10.18.09.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:09:38 -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 37/38] usercopy: Restrict non-usercopy caches to size 0 Date: Wed, 10 Jan 2018 18:03:09 -0800 Message-Id: <1515636190-24061-38-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515636190-24061-1-git-send-email-keescook@chromium.org> References: <1515636190-24061-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);