From patchwork Thu Jan 11 02:02:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156655 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 3256860231 for ; Thu, 11 Jan 2018 02:16:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FE7B2874E for ; Thu, 11 Jan 2018 02:16:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13E442874F; Thu, 11 Jan 2018 02:16:38 +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 A0A302874C for ; Thu, 11 Jan 2018 02:16:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754454AbeAKCQT (ORCPT ); Wed, 10 Jan 2018 21:16:19 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:32819 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753885AbeAKCJi (ORCPT ); Wed, 10 Jan 2018 21:09:38 -0500 Received: by mail-pg0-f68.google.com with SMTP id i196so1646084pgd.0 for ; Wed, 10 Jan 2018 18:09:38 -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=QeA3O4y/pw0jvX7r5wknxWqFnpHd8Lb78gYujaCHzwU=; b=S0/6xQdUcU3Gp1J6z0lul4v1ap4XeWYIP6fIrW6qjnhnWW/IONzJLEECQs5Bc3cF7h 2LczQEw3THX+5SgHK8+5QDat8K7xCXqmZIvC30OCRQDeINK/veRZcYrN4+XWHVqxnIFW 86JtjY3jQ6k9/5VTnFM2vWFMmDMB6d9Glizvk= 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=QeA3O4y/pw0jvX7r5wknxWqFnpHd8Lb78gYujaCHzwU=; b=HcSKHDH+/bsCFrmrZjGPNsopZP0RcmiejFNRsSiGUsN3Ys9DQkrcVbxAphp/Kur2tr 4jutK2qXfnRmjvt/pE5BplPHwpBpA7F8WOte/8c1OLUXhyBKOLEUbH4u4azscLKFSE68 q5rusWNLx1fvuVRcANAFnQm1CiIp/vZds4CNaSayl6XUmYBxdMC1Bm0Hta/ZBQV+tZVN b+xLa6ATpUPHAaA1L2LBX82BXVH64dbtzknjihID7pv5Q/ax7XUx2caVZiVdlPfJ83TF qbc6aortqF+yBM/agRKs1e2b7AHPvrDbemQ6uenh5QeUMUYkLFMiviQymXlM7/ltqJsV oliQ== X-Gm-Message-State: AKGB3mJ+LirOHvLtMQ3xq2wavaJdWMcGAJk5GtWEyQI905cEezYLlwdz hUp0a8a/dbkCbNJVxJZe0seBbA== X-Google-Smtp-Source: ACJfBovuIxWCifyFnphhOQ/M2lnpjYBjE8wG4FBx9lmJdLPfx3vys5T07PTrUVnr+kvTeIR9z6ijag== X-Received: by 10.84.252.142 with SMTP id y14mr21486180pll.275.1515636577622; Wed, 10 Jan 2018 18:09:37 -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 q7sm31047368pgc.84.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 , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, Linus Torvalds , Alexander Viro , Andrew Morton , Andy Lutomirski , Christoph Hellwig , Christoph Lameter , "David S. Miller" , Laura Abbott , Mark Rutland , 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 22/38] scsi: Define usercopy region in scsi_sense_cache slab cache Date: Wed, 10 Jan 2018 18:02:54 -0800 Message-Id: <1515636190-24061-23-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 SCSI sense buffers, stored in struct scsi_cmnd.sense and therefore contained in the scsi_sense_cache slab cache, need to be copied to/from userspace. cache object allocation: drivers/scsi/scsi_lib.c: scsi_select_sense_cache(...): return ... ? scsi_sense_isadma_cache : scsi_sense_cache scsi_alloc_sense_buffer(...): return kmem_cache_alloc_node(scsi_select_sense_cache(), ...); scsi_init_request(...): ... cmd->sense_buffer = scsi_alloc_sense_buffer(...); ... cmd->req.sense = cmd->sense_buffer example usage trace: block/scsi_ioctl.c: (inline from sg_io) blk_complete_sghdr_rq(...): struct scsi_request *req = scsi_req(rq); ... copy_to_user(..., req->sense, len) scsi_cmd_ioctl(...): sg_io(...); In support of usercopy hardening, this patch defines a region in the scsi_sense_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 dynamically sized copy operation involving cache-managed memory falls entirely within the slab's usercopy region. Signed-off-by: David Windsor [kees: adjust commit log, provide usage trace] Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org Signed-off-by: Kees Cook --- drivers/scsi/scsi_lib.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 1cbc497e00bd..164d062c4d94 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -79,14 +79,15 @@ int scsi_init_sense_cache(struct Scsi_Host *shost) if (shost->unchecked_isa_dma) { scsi_sense_isadma_cache = kmem_cache_create("scsi_sense_cache(DMA)", - SCSI_SENSE_BUFFERSIZE, 0, - SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA, NULL); + SCSI_SENSE_BUFFERSIZE, 0, + SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA, NULL); if (!scsi_sense_isadma_cache) ret = -ENOMEM; } else { scsi_sense_cache = - kmem_cache_create("scsi_sense_cache", - SCSI_SENSE_BUFFERSIZE, 0, SLAB_HWCACHE_ALIGN, NULL); + kmem_cache_create_usercopy("scsi_sense_cache", + SCSI_SENSE_BUFFERSIZE, 0, SLAB_HWCACHE_ALIGN, + 0, SCSI_SENSE_BUFFERSIZE, NULL); if (!scsi_sense_cache) ret = -ENOMEM; }