diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2014-06-25 17:52:38 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-06-25 09:53:47 -0600 |
| commit | 54ed4ed8f9a5071a3bbae2e037376d8c02b9629b (patch) | |
| tree | 8af1eb069624fa2aa4ab8a27b7eb39429b2998c0 /drivers/block | |
| parent | 0ffbce80c263821161190f20e74a12f7aa8eab7b (diff) | |
| download | blackbird-op-linux-54ed4ed8f9a5071a3bbae2e037376d8c02b9629b.tar.gz blackbird-op-linux-54ed4ed8f9a5071a3bbae2e037376d8c02b9629b.zip | |
drbd: fix NULL pointer deref in blk_add_request_payload
Discards don't have any payload.
But the scsi layer still expects a bio_vec it can use internally,
see sd_setup_discard_cmnd() and blk_add_request_payload().
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index b6c8aaf4931b..5b17ec88ea05 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1337,8 +1337,11 @@ int drbd_submit_peer_request(struct drbd_device *device, return 0; } + /* Discards don't have any payload. + * But the scsi layer still expects a bio_vec it can use internally, + * see sd_setup_discard_cmnd() and blk_add_request_payload(). */ if (peer_req->flags & EE_IS_TRIM) - nr_pages = 0; /* discards don't have any payload. */ + nr_pages = 1; /* In most cases, we will only need one bio. But in case the lower * level restrictions happen to be different at this offset on this |
