From: Christoph Hellwig <hch@lst.de>
To: Ming Lei <tom.leiming@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
linux-block <linux-block@vger.kernel.org>,
Linux SCSI List <linux-scsi@vger.kernel.org>,
stable <stable@vger.kernel.org>
Subject: Re: [PATCH 1/2] scsi_transport_fc: fix NULL pointer dereference in fc_bsg_job_timeout
Date: Wed, 6 Sep 2017 13:36:26 +0200 [thread overview]
Message-ID: <20170906113626.GA25839@lst.de> (raw)
In-Reply-To: <CACVXFVOqKUMvoURs0MXcoJaxG3u5n5D-6sxjUJ+m-Z9uTte61A@mail.gmail.com>
On Wed, Sep 06, 2017 at 06:59:39PM +0800, Ming Lei wrote:
> On Wed, Sep 6, 2017 at 6:11 PM, Christoph Hellwig <hch@lst.de> wrote:
> > bsg-lib now embeddeds the job structure into the request, and req->special
> > can't be used anymore.
> >
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > Cc: stable@vger.kernel.org
> > ---
> > drivers/scsi/scsi_transport_fc.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
> > index 3c6bc0081fcb..d8de46806a1e 100644
> > --- a/drivers/scsi/scsi_transport_fc.c
> > +++ b/drivers/scsi/scsi_transport_fc.c
> > @@ -3571,7 +3571,7 @@ fc_vport_sched_delete(struct work_struct *work)
> > static enum blk_eh_timer_return
> > fc_bsg_job_timeout(struct request *req)
> > {
> > - struct bsg_job *job = (void *) req->special;
> > + struct bsg_job *job = blk_mq_rq_to_pdu(req->special);
>
> still req->special?
Meh, sent out before the rebase finished - I'll fix it up.
next prev parent reply other threads:[~2017-09-06 11:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-06 10:11 two small bsg fixes Christoph Hellwig
2017-09-06 10:11 ` [PATCH 1/2] scsi_transport_fc: fix NULL pointer dereference in fc_bsg_job_timeout Christoph Hellwig
2017-09-06 10:59 ` Ming Lei
2017-09-06 11:36 ` Christoph Hellwig [this message]
2017-09-06 10:11 ` [PATCH 2/2] bsg-lib: don't free job in bsg_prepare_job Christoph Hellwig
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=20170906113626.GA25839@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tom.leiming@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.