lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 13 Apr 2017 16:05:23 -0600 From: Logan Gunthorpe <logang@...tatee.com> To: Christoph Hellwig <hch@....de>, "Martin K. Petersen" <martin.petersen@...cle.com>, Sagi Grimberg <sagi@...mberg.me>, Jens Axboe <axboe@...nel.dk>, Tejun Heo <tj@...nel.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Dan Williams <dan.j.williams@...el.com>, Ross Zwisler <ross.zwisler@...ux.intel.com>, Matthew Wilcox <mawilcox@...rosoft.com>, Sumit Semwal <sumit.semwal@...aro.org>, Ming Lin <ming.l@....samsung.com>, linux-kernel@...r.kernel.org, linux-crypto@...r.kernel.org, linux-media@...r.kernel.org, dri-devel@...ts.freedesktop.org, linaro-mm-sig@...ts.linaro.org, intel-gfx@...ts.freedesktop.org, linux-raid@...r.kernel.org, linux-mmc@...r.kernel.org, linux-nvme@...ts.infradead.org, linux-nvdimm@...ts.01.org, linux-scsi@...r.kernel.org, fcoe-devel@...n-fcoe.org, open-iscsi@...glegroups.com, megaraidlinux.pdl@...adcom.com, sparmaintainer@...sys.com, devel@...verdev.osuosl.org, target-devel@...r.kernel.org, netdev@...r.kernel.org, linux-rdma@...r.kernel.org, rds-devel@....oracle.com Cc: Steve Wise <swise@...ngridcomputing.com>, Stephen Bates <sbates@...thlin.com>, Logan Gunthorpe <logang@...tatee.com> Subject: [PATCH 10/22] staging: unisys: visorbus: Make use of the new sg_map helper function Straightforward conversion to the new function. Signed-off-by: Logan Gunthorpe <logang@...tatee.com> --- drivers/staging/unisys/visorhba/visorhba_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c index 0ce92c8..2d8c8bc 100644 --- a/drivers/staging/unisys/visorhba/visorhba_main.c +++ b/drivers/staging/unisys/visorhba/visorhba_main.c @@ -842,7 +842,6 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) struct scatterlist *sg; unsigned int i; char *this_page; - char *this_page_orig; int bufind = 0; struct visordisk_info *vdisk; struct visorhba_devdata *devdata; @@ -869,11 +868,14 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) sg = scsi_sglist(scsicmd); for (i = 0; i < scsi_sg_count(scsicmd); i++) { - this_page_orig = kmap_atomic(sg_page(sg + i)); - this_page = (void *)((unsigned long)this_page_orig | - sg[i].offset); + this_page = sg_map(sg + i, SG_KMAP_ATOMIC); + if (IS_ERR(this_page)) { + scsicmd->result = DID_ERROR << 16; + return; + } + memcpy(this_page, buf + bufind, sg[i].length); - kunmap_atomic(this_page_orig); + sg_unmap(sg + i, this_page, SG_KMAP_ATOMIC); } } else { devdata = (struct visorhba_devdata *)scsidev->host->hostdata; -- 2.1.4
Powered by blists - more mailing lists