2012-08-09 09:42:38

by Marina Makienko

[permalink] [raw]
Subject: [PATCH] block: Potential null pointer dereference in pkt_generic_packet()

The function blk_get_request() can return NULL. It can lead to further error in pkt_generic_packet().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Marina Makienko <[email protected]>
---
drivers/block/pktcdvd.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index ba66e44..db3192e 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -743,6 +743,11 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
rq = blk_get_request(q, (cgc->data_direction == CGC_DATA_WRITE) ?
WRITE : READ, __GFP_WAIT);

+ if (!rq) {
+ printk(DRIVER_NAME"pkt_generic_packet: blk_get_request failed. \n");
+ return NULL;
+ }
+
if (cgc->buflen) {
if (blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen, __GFP_WAIT))
goto out;
--
1.7.7