浏览代码

mmc: card: Avoid null pointer dereference

After the null check on md the code jumped to cmd_done, which then
will dereference md in mmc_blk_put. This patch avoids the possible
null pointer dereference in that case.

Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>
Reviewed-by: Namjae Jeon <linkinjeon@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Philippe De Swert 13 年之前
父节点
当前提交
1c02f000e7
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/mmc/card/block.c

+ 2 - 1
drivers/mmc/card/block.c

@@ -384,7 +384,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
 	md = mmc_blk_get(bdev->bd_disk);
 	md = mmc_blk_get(bdev->bd_disk);
 	if (!md) {
 	if (!md) {
 		err = -EINVAL;
 		err = -EINVAL;
-		goto cmd_done;
+		goto cmd_err;
 	}
 	}
 
 
 	card = md->queue.card;
 	card = md->queue.card;
@@ -483,6 +483,7 @@ cmd_rel_host:
 
 
 cmd_done:
 cmd_done:
 	mmc_blk_put(md);
 	mmc_blk_put(md);
+cmd_err:
 	kfree(idata->buf);
 	kfree(idata->buf);
 	kfree(idata);
 	kfree(idata);
 	return err;
 	return err;