From patchwork Wed Jul 6 22:25:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9217153 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 F3EB260467 for ; Wed, 6 Jul 2016 22:27:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3E42284C0 for ; Wed, 6 Jul 2016 22:27:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8447284E4; Wed, 6 Jul 2016 22:27:00 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 1027E284C0 for ; Wed, 6 Jul 2016 22:26:59 +0000 (UTC) Received: (qmail 15791 invoked by uid 550); 6 Jul 2016 22:26:05 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: kernel-hardening@lists.openwall.com Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 15570 invoked from network); 6 Jul 2016 22:25:59 -0000 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=kAvQEYCv81LFkI1VrCzJn97Rh6WSqYJREjQTwZm00ts=; b=iGFDcGNTJNsQ/EGSDzPz6KeuLCegtTZXpE+wec+iEri5FrPMSUEC+PYPedsbp+Xavv zm7ob7j7Aw+6PrjBv1Aq6rLJdd6Rrrke2HmB9AKsNzN6VFevlyoDBuLP7oXSgO70m8CC 3j6D1+8xaFAXvhc5Hv5LpbvOZ0qHQ4Bsj2Osk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kAvQEYCv81LFkI1VrCzJn97Rh6WSqYJREjQTwZm00ts=; b=DX4SVlksk5spBtZVcr5R2uQ4Jp7WFeB5QCScahUQWNTFHDaekvj+VQS6qUFJKeyOvs HWLMpW41BeyzzLz/GcdRwKoNdzMBl7dGUtvMECZUvHo8kDalF0xqRPoZkNihtMw+l7Qf AGx+/lrXPRZwnUDQMLAtvdAEXC49R7R5KMlpjgMDGSyD2tu1PMBNVmrdaoqD7UXUMARe 3A2gVtCyKdmwUokpIwR9YfV0iJqL8+P5mRoz+cC/wYfhCAJHYAgveACedhwbFGNggB3U JYhHRhhxPiNw+yUj5wC1yYtCIM9hfbLv7z3i7VBmbDRa4BFOaKbQaGbcOG2Sr3Tph/gQ KLgw== X-Gm-Message-State: ALyK8tLHfSfL4UhqWvaGB5oS0Op6ody/xx93sHvMh5SGvEsU6iY7sJMtDq4EtNX+bcTE0nw2 X-Received: by 10.98.152.210 with SMTP id d79mr45956342pfk.2.1467843947266; Wed, 06 Jul 2016 15:25:47 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , Rik van Riel , Casey Schaufler , PaX Team , Brad Spengler , Russell King , Catalin Marinas , Will Deacon , Ard Biesheuvel , Benjamin Herrenschmidt , Michael Ellerman , Tony Luck , Fenghua Yu , "David S. Miller" , x86@kernel.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Andy Lutomirski , Borislav Petkov , Mathias Krause , Jan Kara , Vitaly Wool , Andrea Arcangeli , Dmitry Vyukov , Laura Abbott , linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Date: Wed, 6 Jul 2016 15:25:28 -0700 Message-Id: <1467843928-29351-10-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467843928-29351-1-git-send-email-keescook@chromium.org> References: <1467843928-29351-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [PATCH 9/9] mm: SLUB hardened usercopy support X-Virus-Scanned: ClamAV using ClamSMTP Under CONFIG_HARDENED_USERCOPY, this adds object size checking to the SLUB allocator to catch any copies that may span objects. Based on code from PaX and grsecurity. Signed-off-by: Kees Cook --- init/Kconfig | 1 + mm/slub.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/init/Kconfig b/init/Kconfig index 798c2020ee7c..1c4711819dfd 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1765,6 +1765,7 @@ config SLAB config SLUB bool "SLUB (Unqueued Allocator)" + select HAVE_HARDENED_USERCOPY_ALLOCATOR help SLUB is a slab allocator that minimizes cache line usage instead of managing queues of cached objects (SLAB approach). diff --git a/mm/slub.c b/mm/slub.c index 825ff4505336..0c8ace04f075 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3614,6 +3614,33 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) EXPORT_SYMBOL(__kmalloc_node); #endif +#ifdef CONFIG_HARDENED_USERCOPY +/* + * Rejects objects that are incorrectly sized. + * + * Returns NULL if check passes, otherwise const char * to name of cache + * to indicate an error. + */ +const char *__check_heap_object(const void *ptr, unsigned long n, + struct page *page) +{ + struct kmem_cache *s; + unsigned long offset; + + /* Find object. */ + s = page->slab_cache; + + /* Find offset within object. */ + offset = (ptr - page_address(page)) % s->size; + + /* Allow address range falling entirely within object size. */ + if (offset <= s->object_size && n <= s->object_size - offset) + return NULL; + + return s->name; +} +#endif /* CONFIG_HARDENED_USERCOPY */ + static size_t __ksize(const void *object) { struct page *page;