From patchwork Mon Jun 19 23:36:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9798065 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 7FBDB603F5 for ; Mon, 19 Jun 2017 23:39:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C46826C9B for ; Mon, 19 Jun 2017 23:39:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 712FA27DCD; Mon, 19 Jun 2017 23:39:29 +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=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no 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 EFF1227861 for ; Mon, 19 Jun 2017 23:39:09 +0000 (UTC) Received: (qmail 15748 invoked by uid 550); 19 Jun 2017 23:37:29 -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: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 11572 invoked from network); 19 Jun 2017 23:37:01 -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=fy2BGKGFd7/lJRCkWDd1HAyWb3cX1L2QtAoP/qnkHFw=; b=V86hH7XB497ujNROW/va+EIQjo7QEVCY32hCLL9ypSr6Efqfb6dPHxl2EEs/nxhRDr gcQCDJdQaiiYa8KkgLNF0o1VEYwooWetmP+qmktHUs9ZnkSQ8lWm0VG0Qi6zot5i/teg gWyvFT69Nazb0mwDN9D8QqK1qquUmf2nEDpYY= 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=fy2BGKGFd7/lJRCkWDd1HAyWb3cX1L2QtAoP/qnkHFw=; b=ZCFLJ4WZhA+J7pXppYLwYctdzZ2YSS/+mPcCUiiVENAiEq5Q/XrwdiCs5jWUic0tSf 0B66UAomDmCiWcbSUgDjxK4LWN2JJp9OsIUpHBlpyvJhXpSq3lAkPxj70+I+SdcmcdXo Ror/zg844loQ72ZKKjhtLe4e8nh9eXGNUob5TykuLPCVdmneQiV3Km4IUAIsL8gi1+iQ G5y5fARMy8rMgA4AriPVB9KBE0rSIPqrRauQj3bHh5hNRqkH8deegmg/k56ZeyiMTQdO ny/lryxixULq4yoCd1CftuDJCKgDyYjPDEWUpthlj6qNSbmnW+OcvFa/wLAWGnaHjvu8 8Cyg== X-Gm-Message-State: AKS2vOzIb1qdGd6Evffg7XvMahrHZuAQuPOFd8sSjTQx28vu1qqNQXk3 I9gq8vSv/BeS2dGX X-Received: by 10.99.117.89 with SMTP id f25mr10289182pgn.5.1497915410076; Mon, 19 Jun 2017 16:36:50 -0700 (PDT) From: Kees Cook To: kernel-hardening@lists.openwall.com Cc: Kees Cook , David Windsor , linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Mon, 19 Jun 2017 16:36:21 -0700 Message-Id: <1497915397-93805-8-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497915397-93805-1-git-send-email-keescook@chromium.org> References: <1497915397-93805-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [PATCH 07/23] exofs: define usercopy region in exofs_inode_cache slab cache X-Virus-Scanned: ClamAV using ClamSMTP From: David Windsor exofs short symlink names and device #'s, stored in struct exofs_i_info.i_data and therefore contained in the exofs_inode_cache slab cache, need to be copied to/from userspace. In support of usercopy hardening, this patch defines a region in the exofs_inode_cache slab cache in which userspace copy operations are allowed. This region is known as the slab cache's usercopy region. Slab caches can now check that each copy operation involving cache-managed memory falls entirely within the slab's usercopy region. 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. Signed-off-by: David Windsor [kees: adjust commit log] Signed-off-by: Kees Cook --- fs/exofs/super.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 819624cfc8da..e5c532875bb7 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c @@ -192,10 +192,13 @@ static void exofs_init_once(void *foo) */ static int init_inodecache(void) { - exofs_inode_cachep = kmem_cache_create("exofs_inode_cache", + exofs_inode_cachep = kmem_cache_create_usercopy("exofs_inode_cache", sizeof(struct exofs_i_info), 0, SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | - SLAB_ACCOUNT, exofs_init_once); + SLAB_ACCOUNT, + offsetof(struct exofs_i_info, i_data), + sizeof_field(struct exofs_i_info, i_data), + exofs_init_once); if (exofs_inode_cachep == NULL) return -ENOMEM; return 0;