From patchwork Thu Jan 11 02:02:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156541 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 A9C5F605BA for ; Thu, 11 Jan 2018 02:09:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97BB62872D for ; Thu, 11 Jan 2018 02:09:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B7832872F; Thu, 11 Jan 2018 02:09:48 +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=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 77EEB2872D for ; Thu, 11 Jan 2018 02:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753849AbeAKCJn (ORCPT ); Wed, 10 Jan 2018 21:09:43 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:41020 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753832AbeAKCJh (ORCPT ); Wed, 10 Jan 2018 21:09:37 -0500 Received: by mail-pg0-f66.google.com with SMTP id 136so1076440pgd.8 for ; Wed, 10 Jan 2018 18:09:36 -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=KMjmaJOqJJKmi5iyPNqoLhDPnngT3NZrdMVoOHoyv88=; b=hHtbKFKBbHrG1TnQjzBGyPhAG6ELUBqSox0kQKy0IJ7aUpe+DpIX2IRr5J+95kB9Tc Hysf8DYOUZ9T9qdpRaYXtvMUFyTl3LdfDjMxXNKNed0YgC/xfyQ6gDEd5aw2L04bZkc/ GsxJ9H+q20YM3x3u+1pekkUeZPn7EhdZ++4Lk= 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=KMjmaJOqJJKmi5iyPNqoLhDPnngT3NZrdMVoOHoyv88=; b=RIbpv9zgnwJ+EPokXpVqw1H0t8cnUhRW9GtYoTx+UJpzfXKnhcoG7htuuapEB+bt9k S6ta/tKuLIFnTrq0SMxkRmC4DTNX+J4gDGQcBPfapQnE8HEo3rwL4kIMc6pzDQxOnonp 9aaqjAg1w77uvpv1GxvTLBKrMP2Zo4/LlqvPUAghHHyQpogmrJNd53L6blQV1N+c7EqF uJDUtN+4bkOcoztN309/5b30+vb6zR9PDFPQqeVwvrh1WlwJQLBAOIF/5oPvBNp6Ptn5 v1DNF8sus2Lls4qalYXsmmpNeUh6sowhnB/p173WkFMBWLnLIgsTw/8OuwlSy0Lhr4tm O+jw== X-Gm-Message-State: AKwxytf+xFOpGWYnD6plXLfoZ3cvRKgb7hjEW/Bq0+6kUBy0NTey4Ecu V18PsgEXlvrppyeD011GmHPa6A== X-Google-Smtp-Source: ACJfBouY2Y6X/T6HVhKUN/J/vbIpbVK7YjUc3Mo5VJZbGC85AmBqklmACAwthIxtrWeoTDmjcFeXjw== X-Received: by 10.101.99.211 with SMTP id n19mr2733895pgv.147.1515636576630; Wed, 10 Jan 2018 18:09:36 -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 s65sm39799668pfk.7.2018.01.10.18.09.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:09:33 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Steve French , linux-cifs@vger.kernel.org, Linus Torvalds , Alexander Viro , Andrew Morton , Andy Lutomirski , Christoph Hellwig , Christoph Lameter , "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, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH 21/38] cifs: Define usercopy region in cifs_request slab cache Date: Wed, 10 Jan 2018 18:02:53 -0800 Message-Id: <1515636190-24061-22-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 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 dynamically sized 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 --- 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 31b7565b1617..29f4b0290fbd 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1231,9 +1231,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; @@ -1259,9 +1261,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);