diff options
| author | Johannes Thumshirn <jthumshirn@suse.de> | 2017-05-10 09:53:40 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-05-16 14:27:27 +0200 |
| commit | d7f93d7e0692c56d789986d54c3973197fb8c44e (patch) | |
| tree | 588513f6d4d134f94def0cebdda2e6801a0dbf10 /drivers | |
| parent | 2e1d377a2afc671f4257ca662bde74ebfabc35f5 (diff) | |
UPSTREAM: scsi: sg: don't return bogus Sg_requests
If the list search in sg_get_rq_mark() fails to find a valid request, we
return a bogus element. This then can later lead to a GPF in
sg_remove_scat().
So don't return bogus Sg_requests in sg_get_rq_mark() but NULL in case
the list search doesn't find a valid request.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Doug Gilbert <dgilbert@interlog.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Chenbo Feng <fengc@google.com>
(cherry picked from commit 48ae8484e9fc324b4968d33c585e54bc98e44d61)
Change-Id: If95d1a8eef3748c9937201e524184b89a5eaaf2e
Bug: 75300370
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/sg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 2ecc4b2f3..156d19776 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -2005,11 +2005,12 @@ sg_get_rq_mark(Sg_fd * sfp, int pack_id) if ((1 == resp->done) && (!resp->sg_io_owned) && ((-1 == pack_id) || (resp->header.pack_id == pack_id))) { resp->done = 2; /* guard against other readers */ - break; + write_unlock_irqrestore(&sfp->rq_list_lock, iflags); + return resp; } } write_unlock_irqrestore(&sfp->rq_list_lock, iflags); - return resp; + return NULL; } /* always adds to end of list */ |