From: Kees Cook <keescook@chromium.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Kees Cook" <keescook@chromium.org>,
"Christoph Hellwig" <hch@infradead.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
"Tejun Heo" <tj@kernel.org>, "Borislav Petkov" <bp@alien8.de>,
"David S. Miller" <davem@davemloft.net>,
"Manoj N. Kumar" <manoj@linux.vnet.ibm.com>,
"Matthew R. Ochs" <mrochs@linux.vnet.ibm.com>,
"Uma Krishnan" <ukrishn@linux.vnet.ibm.com>,
"Nicholas A. Bellinger" <nab@linux-iscsi.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Philippe Ombredanne" <pombredanne@nexb.com>,
"Stephen Boyd" <sboyd@codeaurora.org>,
"Cyrille Pitchen" <cyrille.pitchen@free-electrons.com>,
"Juergen Gross" <jgross@suse.com>,
"Viresh Kumar" <viresh.kumar@linaro.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Sagar Dharia" <sdharia@codeaurora.org>,
"Randy Dunlap" <rdunlap@infradead.org>,
"Vinod Koul" <vinod.koul@intel.com>,
"David Kershner" <david.kershner@unisys.com>,
linux-block@vger.kernel.org, linux-ide@vger.kernel.org,
linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/9] scsi: cxlflash: Drop unused sense buffers
Date: Tue, 31 Jul 2018 12:51:47 -0700 [thread overview]
Message-ID: <20180731195155.46664-3-keescook@chromium.org> (raw)
In-Reply-To: <20180731195155.46664-1-keescook@chromium.org>
This removes the unused sense buffer in read_cap16() and write_same16().
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
---
drivers/scsi/cxlflash/superpipe.c | 8 ++------
drivers/scsi/cxlflash/vlun.c | 7 ++-----
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c
index 2fe79df5c73c..59b9f2023748 100644
--- a/drivers/scsi/cxlflash/superpipe.c
+++ b/drivers/scsi/cxlflash/superpipe.c
@@ -324,7 +324,6 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
struct scsi_sense_hdr sshdr;
u8 *cmd_buf = NULL;
u8 *scsi_cmd = NULL;
- u8 *sense_buf = NULL;
int rc = 0;
int result = 0;
int retry_cnt = 0;
@@ -333,8 +332,7 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
retry:
cmd_buf = kzalloc(CMD_BUFSIZE, GFP_KERNEL);
scsi_cmd = kzalloc(MAX_COMMAND_SIZE, GFP_KERNEL);
- sense_buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
- if (unlikely(!cmd_buf || !scsi_cmd || !sense_buf)) {
+ if (unlikely(!cmd_buf || !scsi_cmd)) {
rc = -ENOMEM;
goto out;
}
@@ -349,7 +347,7 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
/* Drop the ioctl read semahpore across lengthy call */
up_read(&cfg->ioctl_rwsem);
result = scsi_execute(sdev, scsi_cmd, DMA_FROM_DEVICE, cmd_buf,
- CMD_BUFSIZE, sense_buf, &sshdr, to, CMD_RETRIES,
+ CMD_BUFSIZE, NULL, &sshdr, to, CMD_RETRIES,
0, 0, NULL);
down_read(&cfg->ioctl_rwsem);
rc = check_state(cfg);
@@ -380,7 +378,6 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
if (retry_cnt++ < 1) {
kfree(cmd_buf);
kfree(scsi_cmd);
- kfree(sense_buf);
goto retry;
}
}
@@ -411,7 +408,6 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
out:
kfree(cmd_buf);
kfree(scsi_cmd);
- kfree(sense_buf);
dev_dbg(dev, "%s: maxlba=%lld blklen=%d rc=%d\n",
__func__, gli->max_lba, gli->blk_len, rc);
diff --git a/drivers/scsi/cxlflash/vlun.c b/drivers/scsi/cxlflash/vlun.c
index 5deef57a7834..e7e9b2f2ad21 100644
--- a/drivers/scsi/cxlflash/vlun.c
+++ b/drivers/scsi/cxlflash/vlun.c
@@ -425,7 +425,6 @@ static int write_same16(struct scsi_device *sdev,
{
u8 *cmd_buf = NULL;
u8 *scsi_cmd = NULL;
- u8 *sense_buf = NULL;
int rc = 0;
int result = 0;
u64 offset = lba;
@@ -439,8 +438,7 @@ static int write_same16(struct scsi_device *sdev,
cmd_buf = kzalloc(CMD_BUFSIZE, GFP_KERNEL);
scsi_cmd = kzalloc(MAX_COMMAND_SIZE, GFP_KERNEL);
- sense_buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
- if (unlikely(!cmd_buf || !scsi_cmd || !sense_buf)) {
+ if (unlikely(!cmd_buf || !scsi_cmd)) {
rc = -ENOMEM;
goto out;
}
@@ -456,7 +454,7 @@ static int write_same16(struct scsi_device *sdev,
/* Drop the ioctl read semahpore across lengthy call */
up_read(&cfg->ioctl_rwsem);
result = scsi_execute(sdev, scsi_cmd, DMA_TO_DEVICE, cmd_buf,
- CMD_BUFSIZE, sense_buf, NULL, to,
+ CMD_BUFSIZE, NULL, NULL, to,
CMD_RETRIES, 0, 0, NULL);
down_read(&cfg->ioctl_rwsem);
rc = check_state(cfg);
@@ -481,7 +479,6 @@ static int write_same16(struct scsi_device *sdev,
out:
kfree(cmd_buf);
kfree(scsi_cmd);
- kfree(sense_buf);
dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
return rc;
}
--
2.17.1
next prev parent reply other threads:[~2018-07-31 19:52 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 19:51 [PATCH v2 0/9] block: Consolidate scsi sense buffer usage Kees Cook
2018-07-31 19:51 ` [PATCH v2 1/9] ide-cd: Drop unused sense buffers Kees Cook
2018-07-31 21:29 ` David Miller
2018-07-31 19:51 ` Kees Cook [this message]
2018-07-31 19:51 ` [PATCH v2 3/9] scsi: build scsi_common.o for all scsi passthrough request users Kees Cook
2018-07-31 20:01 ` Bart Van Assche
2018-07-31 20:12 ` hch
2018-07-31 20:18 ` Bart Van Assche
2018-08-01 19:50 ` Kees Cook
2018-07-31 19:51 ` [PATCH v2 4/9] target: don't depend on SCSI Kees Cook
2018-08-06 23:38 ` Randy Dunlap
2018-08-06 23:59 ` Kees Cook
2018-08-07 0:52 ` Randy Dunlap
2018-08-07 5:44 ` Christoph Hellwig
2018-07-31 19:51 ` [PATCH v2 5/9] block: Switch struct packet_command to use struct scsi_sense_hdr Kees Cook
2018-08-01 8:22 ` Christoph Hellwig
2018-07-31 19:51 ` [PATCH v2 6/9] ide-cd: Remove redundant sense buffer Kees Cook
2018-07-31 21:30 ` David Miller
2018-08-01 8:23 ` Christoph Hellwig
2018-07-31 19:51 ` [PATCH v2 7/9] cdrom: Use struct scsi_sense_hdr internally Kees Cook
2018-08-01 8:24 ` Christoph Hellwig
2018-07-31 19:51 ` [PATCH v2 8/9] libata-scsi: Move sense buffers onto stack Kees Cook
2018-08-01 8:24 ` Christoph Hellwig
2018-08-01 15:45 ` Tejun Heo
2018-07-31 19:51 ` [PATCH v2 9/9] scsi: Check sense buffer size at build time Kees Cook
2018-08-01 8:25 ` Christoph Hellwig
2018-08-02 20:21 ` [PATCH v2 0/9] block: Consolidate scsi sense buffer usage Martin K. Petersen
2018-08-02 21:24 ` Jens Axboe
2018-08-02 21:56 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180731195155.46664-3-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=axboe@kernel.dk \
--cc=bp@alien8.de \
--cc=cyrille.pitchen@free-electrons.com \
--cc=davem@davemloft.net \
--cc=david.kershner@unisys.com \
--cc=hch@infradead.org \
--cc=jejb@linux.vnet.ibm.com \
--cc=jgross@suse.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=manoj@linux.vnet.ibm.com \
--cc=martin.petersen@oracle.com \
--cc=mrochs@linux.vnet.ibm.com \
--cc=nab@linux-iscsi.org \
--cc=pombredanne@nexb.com \
--cc=rdunlap@infradead.org \
--cc=sboyd@codeaurora.org \
--cc=sdharia@codeaurora.org \
--cc=target-devel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=ukrishn@linux.vnet.ibm.com \
--cc=vinod.koul@intel.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).