From patchwork Wed Sep 20 20:45:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962401 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 CE27260234 for ; Wed, 20 Sep 2017 20:46:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C099E29227 for ; Wed, 20 Sep 2017 20:46:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B549F2922A; Wed, 20 Sep 2017 20:46:20 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 3820329227 for ; Wed, 20 Sep 2017 20:46:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbdITUqS (ORCPT ); Wed, 20 Sep 2017 16:46:18 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:48200 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751938AbdITUqP (ORCPT ); Wed, 20 Sep 2017 16:46:15 -0400 Received: by mail-pg0-f46.google.com with SMTP id v23so2333985pgc.5 for ; Wed, 20 Sep 2017 13:46:15 -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=ErIxzF/Xu/2NZZKnHLK0hzq0ZrhO56rwZ77Q2c+O7Y8=; b=a0KHLHewgT3WMj4ycgRnE/k4/SnM1DN8iHVua9lmyyHKvZ0A41xXzJ4aN8Zybd+z9B voMVpMmg5CmTprSBa456YJEm+i4GnjCaLuVcs5pvUjdiZROiM9dEYXNVnBr3S1PXpSEm dmEo6KYNAY9j7H0b5BbXlxAwUPpYZRoPf7sNE= 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=ErIxzF/Xu/2NZZKnHLK0hzq0ZrhO56rwZ77Q2c+O7Y8=; b=PGorwUBdX2f4HaPKIhNrLF5UTgCGr/wOTa03Qgvy5PPeu0UG10TCZezLPVRKs9JaDf 3QjsRDoSvCxmVpIhI7Zcuev1P7WPvsbJtA3zyn3ObS5WudEWl+KET+gXyhUYE+zv1ebX N29KnJBb/0w9B+qr5bjeXkPnk2Pwe/i8pfPNeW0qMnuRmyJB7KSpmCiqsRuplYNmV24b /wmU2TqfLyQkkP4MaIT8jII0r575Pp2Ti/5lAem/fdSGXQmqXMMmY9XtO10QA00+VWM8 E3Tp/HGtwrK034J3uuSFLXmmyyv9f8fIu0iKhPOMn8TwcdLbGwsZruLYYLzVpzq2S5W+ OJVg== X-Gm-Message-State: AHPjjUgsEXzQgvhGfkaKoeTT+PljqyPga7sQmFNKIDeoKS0Iq2yxRuOO NGZ0BBchW0k65cD3N63QNm9kSw== X-Google-Smtp-Source: AOwi7QC3SBQuv5ScYeh+3sjLv1sAEPGXdjl2npvnYqsvYMcxH4GB0t5MmaaOjcYnGDvYZKxczcEhFg== X-Received: by 10.84.248.144 with SMTP id q16mr3313921pll.345.1505940374877; Wed, 20 Sep 2017 13:46:14 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id p127sm8724757pfp.168.2017.09.20.13.46.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 13:46:08 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Steve French , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH v3 16/31] cifs: Define usercopy region in cifs_request slab cache Date: Wed, 20 Sep 2017 13:45:22 -0700 Message-Id: <1505940337-79069-17-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505940337-79069-1-git-send-email-keescook@chromium.org> References: <1505940337-79069-1-git-send-email-keescook@chromium.org> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Windsor CIFS request buffers, stored in the cifs_request slab cache, need to be copied to/from userspace. cache object allocation: fs/cifs/cifsfs.c: cifs_init_request_bufs(): ... cifs_req_poolp = mempool_create_slab_pool(cifs_min_rcv, cifs_req_cachep); fs/cifs/misc.c: cifs_buf_get(): ... ret_buf = mempool_alloc(cifs_req_poolp, GFP_NOFS); ... return ret_buf; In support of usercopy hardening, this patch defines a region in the cifs_request 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 verbatim 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, provide usage trace] Cc: Steve French Cc: linux-cifs@vger.kernel.org Signed-off-by: Kees Cook --- I wasn't able to actually track down the _usage_ of the cifs_request where it is copied to userspace. If any CIFS folks could help point that out, it would be very welcome. :) I suspect it might be part of the debug routines, but I never managed to exercise them. --- fs/cifs/cifsfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 180b3356ff86..09dfdf76c738 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1229,9 +1229,11 @@ cifs_init_request_bufs(void) cifs_dbg(VFS, "CIFSMaxBufSize %d 0x%x\n", CIFSMaxBufSize, CIFSMaxBufSize); */ - cifs_req_cachep = kmem_cache_create("cifs_request", + cifs_req_cachep = kmem_cache_create_usercopy("cifs_request", CIFSMaxBufSize + max_hdr_size, 0, - SLAB_HWCACHE_ALIGN, NULL); + SLAB_HWCACHE_ALIGN, 0, + CIFSMaxBufSize + max_hdr_size, + NULL); if (cifs_req_cachep == NULL) return -ENOMEM; @@ -1257,9 +1259,9 @@ cifs_init_request_bufs(void) more SMBs to use small buffer alloc and is still much more efficient to alloc 1 per page off the slab compared to 17K (5page) alloc of large cifs buffers even when page debugging is on */ - cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq", + cifs_sm_req_cachep = kmem_cache_create_usercopy("cifs_small_rq", MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN, - NULL); + 0, MAX_CIFS_SMALL_BUFFER_SIZE, NULL); if (cifs_sm_req_cachep == NULL) { mempool_destroy(cifs_req_poolp); kmem_cache_destroy(cifs_req_cachep);