{"id":816510,"url":"http://patchwork.ozlabs.org/api/patches/816510/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-18-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505940337-79069-18-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-09-20T20:45:23","name":"[v3,17/31] scsi: Define usercopy region in scsi_sense_cache slab cache","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"e4826860c6c8fc452cae3ff727758d992e832588","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-18-git-send-email-keescook@chromium.org/mbox/","series":[{"id":4231,"url":"http://patchwork.ozlabs.org/api/series/4231/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4231","date":"2017-09-20T20:45:22","name":"Hardened usercopy whitelisting","version":3,"mbox":"http://patchwork.ozlabs.org/series/4231/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816510/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816510/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"Yxm5lYvF\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyBv12SHwz9s8J\n\tfor ;\n\tThu, 21 Sep 2017 06:59:25 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751900AbdITU7H (ORCPT );\n\tWed, 20 Sep 2017 16:59:07 -0400","from mail-pg0-f50.google.com ([74.125.83.50]:48645 \"EHLO\n\tmail-pg0-f50.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752094AbdITUwy (ORCPT\n\t); Wed, 20 Sep 2017 16:52:54 -0400","by mail-pg0-f50.google.com with SMTP id v23so2342689pgc.5\n\tfor ; Wed, 20 Sep 2017 13:52:54 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\tx28sm9795273pfi.8.2017.09.20.13.52.48\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 13:52:52 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=pyFDIaXBXd/xydwRlXh6RPXOHouRALUO1bJrvgXof6w=;\n\tb=Yxm5lYvFf3wPzsa4PgX87jT8KcfJT1KNmq6mG51YRzB3AMGSxCKi+4cqK2iFsqUN2K\n\t1w9sLkgzP6dnkqx4sGDuEoZgKSaeWEJnvkbNIX3UwAR57d86hwWh1mWTlagukyj4w3Ja\n\tAikwSJlYm1sjLoTgNAMONtYGPAXtkRkETUPb0=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=pyFDIaXBXd/xydwRlXh6RPXOHouRALUO1bJrvgXof6w=;\n\tb=qAzk/vk7BJKxLltkEMvzYAeyd+UC+GFH3mmIaREcbLokWXN5ne6WdMlALqZhevCCuC\n\tFZXBppCUU56NLzFqR90y3D4OCABcaw0W6oxD8YH7+BPGjGcAG9cMf6vtOSUVmbUCpSmq\n\td9Y4m8h0GSkB8dm3pr7lhGQrd+rpGzqHtcJZZZKaOlZw1KmPtTPRwB+ef18JRMgb38p5\n\tdGtzw7v65+lqpZPUmilsks1CbxRkLoCsk04wnGkxscma/fEt5aLSO0etX7NGqfVNfmmS\n\t9gAskQe/HU4zQRsgJH2U9ERax8eiv28SAiLujp2927aN4KxYAm+wKCtt+bYTZn4yr0ai\n\tSj6Q==","X-Gm-Message-State":"AHPjjUh7G7AuK6I5sIQ53apx2TxlTYKp3rM4HZvNjac4Ednx8fbXqf5C\n\tQDebjHMtD8UizrfGigikRBxjGA==","X-Google-Smtp-Source":"AOwi7QBeSrwPzi/1uoSQ8zSMwjWWj98tbYXJI5cT0XsDEVKGZlEkHLXEUEV1RA2HfZs3ZePpS2D8hA==","X-Received":"by 10.84.133.111 with SMTP id 102mr1087393plf.204.1505940773930; \n\tWed, 20 Sep 2017 13:52:53 -0700 (PDT)","From":"Kees Cook ","To":"linux-kernel@vger.kernel.org","Cc":"Kees Cook , David Windsor ,\n\t\"James E.J. Bottomley\" ,\n\t\"Martin K. Petersen\" ,\n\tlinux-scsi@vger.kernel.org, linux-fsdevel@vger.kernel.org,\n\tnetdev@vger.kernel.org, linux-mm@kvack.org,\n\tkernel-hardening@lists.openwall.com","Subject":"[PATCH v3 17/31] scsi: Define usercopy region in scsi_sense_cache\n\tslab cache","Date":"Wed, 20 Sep 2017 13:45:23 -0700","Message-Id":"<1505940337-79069-18-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":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: David Windsor \n\nSCSI sense buffers, stored in struct scsi_cmnd.sense and therefore\ncontained in the scsi_sense_cache slab cache, need to be copied to/from\nuserspace.\n\ncache object allocation:\n drivers/scsi/scsi_lib.c:\n scsi_select_sense_cache(...):\n return ... ? scsi_sense_isadma_cache : scsi_sense_cache\n\n scsi_alloc_sense_buffer(...):\n return kmem_cache_alloc_node(scsi_select_sense_cache(), ...);\n\n scsi_init_request(...):\n ...\n cmd->sense_buffer = scsi_alloc_sense_buffer(...);\n ...\n cmd->req.sense = cmd->sense_buffer\n\nexample usage trace:\n\n block/scsi_ioctl.c:\n (inline from sg_io)\n blk_complete_sghdr_rq(...):\n struct scsi_request *req = scsi_req(rq);\n ...\n copy_to_user(..., req->sense, len)\n\n scsi_cmd_ioctl(...):\n sg_io(...);\n\nIn support of usercopy hardening, this patch defines a region in\nthe scsi_sense_cache slab cache in which userspace copy operations\nare allowed.\n\nThis region is known as the slab cache's usercopy region. Slab\ncaches can now check that each copy operation involving cache-managed\nmemory falls entirely within the slab's usercopy region.\n\nSigned-off-by: David Windsor \n[kees: adjust commit log, provide usage trace]\nCc: \"James E.J. Bottomley\" \nCc: \"Martin K. Petersen\" \nCc: linux-scsi@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/scsi/scsi_lib.c | 9 +++++----\n 1 file changed, 5 insertions(+), 4 deletions(-)","diff":"diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c\nindex 9cf6a80fe297..88bfab251693 100644\n--- a/drivers/scsi/scsi_lib.c\n+++ b/drivers/scsi/scsi_lib.c\n@@ -79,14 +79,15 @@ int scsi_init_sense_cache(struct Scsi_Host *shost)\n \tif (shost->unchecked_isa_dma) {\n \t\tscsi_sense_isadma_cache =\n \t\t\tkmem_cache_create(\"scsi_sense_cache(DMA)\",\n-\t\t\tSCSI_SENSE_BUFFERSIZE, 0,\n-\t\t\tSLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA, NULL);\n+\t\t\t\tSCSI_SENSE_BUFFERSIZE, 0,\n+\t\t\t\tSLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA, NULL);\n \t\tif (!scsi_sense_isadma_cache)\n \t\t\tret = -ENOMEM;\n \t} else {\n \t\tscsi_sense_cache =\n-\t\t\tkmem_cache_create(\"scsi_sense_cache\",\n-\t\t\tSCSI_SENSE_BUFFERSIZE, 0, SLAB_HWCACHE_ALIGN, NULL);\n+\t\t\tkmem_cache_create_usercopy(\"scsi_sense_cache\",\n+\t\t\t\tSCSI_SENSE_BUFFERSIZE, 0, SLAB_HWCACHE_ALIGN,\n+\t\t\t\t0, SCSI_SENSE_BUFFERSIZE, NULL);\n \t\tif (!scsi_sense_cache)\n \t\t\tret = -ENOMEM;\n \t}\n","prefixes":["v3","17/31"]}