commit 55872c5a3c01f0fe7b5298d19e24e237f5b5ff06
author Jens Axboe <axboe@fb.com> Thu Aug 28 15:05:40 2014 -0600
committer Jens Axboe <axboe@fb.com> Fri Aug 29 08:34:14 2014 -0600
tree e1747d5c4a677f2266388eccf4f03c772a786345
parent a492f075450f3ba87de36e5ffe92a9d0c7af9723

bsg: fix potential error pointer dereference

Dan writes:

block/bsg.c:327 bsg_map_hdr() error: 'next_rq' dereferencing possible
ERR_PTR().

Fix this by setting next_rq to NULL, for the case where it can be
!= NULL but an error pointer.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

block/bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index 73c78fd..276e869 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -287,6 +287,7 @@
 		next_rq = blk_get_request(q, READ, GFP_KERNEL);
 		if (IS_ERR(next_rq)) {
 			ret = PTR_ERR(next_rq);
+			next_rq = NULL;
 			goto out;
 		}
 		rq->next_rq = next_rq;