From patchwork Tue May 22 18:15:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10419325 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 30FFE6053B for ; Tue, 22 May 2018 18:15:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20D1528F42 for ; Tue, 22 May 2018 18:15:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 128E128FBC; Tue, 22 May 2018 18:15:52 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 9590228F42 for ; Tue, 22 May 2018 18:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751656AbeEVSPh (ORCPT ); Tue, 22 May 2018 14:15:37 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:40814 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751390AbeEVSP0 (ORCPT ); Tue, 22 May 2018 14:15:26 -0400 Received: by mail-pl0-f66.google.com with SMTP id t12-v6so11374459plo.7 for ; Tue, 22 May 2018 11:15:25 -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=+2HQTZYPA0C48EDdQjpVt/C2s/eKEfFSDAk8hZXCMPg=; b=dnHSNVlcPaB0kLU6E+3gsvFAXHGfqeicCFGn//AzJZY0NWRe8DRJJPqvRhyZbp+TeK Oy0XRVvz+CLpLuLEIKTONWovHhBjZ/JOJP/StBtuli45CsT2SDddP1y1OGVlPJ99i4Md KBxGqpPCBzWcJ8gO52r4xcJai2MZfS9SfZZw8= 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=+2HQTZYPA0C48EDdQjpVt/C2s/eKEfFSDAk8hZXCMPg=; b=QxXKVd05zykSjJR6keEz6e13sg5Nt00i7qNaYmdf+nX9mWuLTbR/+egVt+VxrzEfzc M6bTLKtn2GeVvVS5bOt7B+FQevm5HzLaIqFD4F+wcEp6KjScfXYhGrSs4YJktSEoFxzf VnS3JHthDz2yBsYc8pcY0fRkM2jXFw6s/yh9kby5XIZrh9+BWnAnwZPgwmtCXAjytvtg OkHU6QIZzB/q2t+oApoTq12/MBnTTyf6ghyMjzJpgq9aDBcE1jHr6eOjH3u9dSpnyECh qe7NcVsqhZx8DxeE1i0P5sViWRX1dimhfAOXjRLtJhYQEBt5/M1i3hjcHo7742RrFoOP HYZQ== X-Gm-Message-State: ALKqPwcNsPUVj2Y//NfdSl3/62GeDKCYZ0QQF3tu+Gue6tK38gytLNop ANCPBT1OkrbAMjyRM+P3+V+hTw== X-Google-Smtp-Source: AB8JxZpWSbBzEY2wF7pLGJN7xlTShGdYR6tOLAzZnIKjEHlaomZayxEgmr0qVltGOCfqVgkn4AJ6fA== X-Received: by 2002:a17:902:9344:: with SMTP id g4-v6mr26133370plp.10.1527012925549; Tue, 22 May 2018 11:15:25 -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 126-v6sm2676580pge.8.2018.05.22.11.15.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 11:15:23 -0700 (PDT) From: Kees Cook To: Jens Axboe Cc: Kees Cook , "Martin K. Petersen" , James Bottomley , Tejun Heo , Borislav Petkov , "David S. Miller" , "Manoj N. Kumar" , "Matthew R. Ochs" , Uma Krishnan , linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] libata-scsi: Move sense buffers onto stack Date: Tue, 22 May 2018 11:15:11 -0700 Message-Id: <20180522181512.39316-6-keescook@chromium.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522181512.39316-1-keescook@chromium.org> References: <20180522181512.39316-1-keescook@chromium.org> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of dynamically allocating the sense buffers, put them on the stack so that future compile-time sizeof() checks will be able to see their buffer length. Signed-off-by: Kees Cook --- drivers/ata/libata-scsi.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 89a9d4a2efc8..3a43d3a1ce2d 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -597,8 +597,9 @@ static int ata_get_identity(struct ata_port *ap, struct scsi_device *sdev, int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) { int rc = 0; + u8 sensebuf[SCSI_SENSE_BUFFERSIZE]; u8 scsi_cmd[MAX_COMMAND_SIZE]; - u8 args[4], *argbuf = NULL, *sensebuf = NULL; + u8 args[4], *argbuf = NULL; int argsize = 0; enum dma_data_direction data_dir; struct scsi_sense_hdr sshdr; @@ -610,10 +611,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) if (copy_from_user(args, arg, sizeof(args))) return -EFAULT; - sensebuf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_NOIO); - if (!sensebuf) - return -ENOMEM; - + memset(sensebuf, 0, sizeof(sensebuf)); memset(scsi_cmd, 0, sizeof(scsi_cmd)); if (args[3]) { @@ -685,7 +683,6 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) && copy_to_user(arg + sizeof(args), argbuf, argsize)) rc = -EFAULT; error: - kfree(sensebuf); kfree(argbuf); return rc; } @@ -704,8 +701,9 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) { int rc = 0; + u8 sensebuf[SCSI_SENSE_BUFFERSIZE]; u8 scsi_cmd[MAX_COMMAND_SIZE]; - u8 args[7], *sensebuf = NULL; + u8 args[7]; struct scsi_sense_hdr sshdr; int cmd_result; @@ -715,10 +713,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) if (copy_from_user(args, arg, sizeof(args))) return -EFAULT; - sensebuf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_NOIO); - if (!sensebuf) - return -ENOMEM; - + memset(sensebuf, 0, sizeof(sensebuf)); memset(scsi_cmd, 0, sizeof(scsi_cmd)); scsi_cmd[0] = ATA_16; scsi_cmd[1] = (3 << 1); /* Non-data */ @@ -769,7 +764,6 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) } error: - kfree(sensebuf); return rc; }