* [PATCH] paride/pfd: need to set queue to NULL before put_disk
@ 2019-08-13 8:59 zhengbin
2019-08-13 8:59 ` [PATCH] paride/pf: " zhengbin
0 siblings, 1 reply; 4+ messages in thread
From: zhengbin @ 2019-08-13 8:59 UTC (permalink / raw)
To: tim, axboe, linux-block; +Cc: yi.zhang, zhengbin13
In pcd_init_units, if blk_mq_init_sq_queue fails, need to set queue to
NULL before put_disk, otherwise null-ptr-deref Read will occur.
put_disk
kobject_put
disk_release
blk_put_queue(disk->queue)
Fixes: f0d176255401 ("paride/pcd: Fix potential NULL pointer dereference and mem leak")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
---
drivers/block/paride/pcd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 001dbdc..bfca80d 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -314,8 +314,8 @@ static void pcd_init_units(void)
disk->queue = blk_mq_init_sq_queue(&cd->tag_set, &pcd_mq_ops,
1, BLK_MQ_F_SHOULD_MERGE);
if (IS_ERR(disk->queue)) {
- put_disk(disk);
disk->queue = NULL;
+ put_disk(disk);
continue;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] paride/pf: need to set queue to NULL before put_disk
2019-08-13 8:59 [PATCH] paride/pfd: need to set queue to NULL before put_disk zhengbin
@ 2019-08-13 8:59 ` zhengbin
2019-09-04 8:49 ` zhengbin (A)
2019-09-04 13:00 ` Jens Axboe
0 siblings, 2 replies; 4+ messages in thread
From: zhengbin @ 2019-08-13 8:59 UTC (permalink / raw)
To: tim, axboe, linux-block; +Cc: yi.zhang, zhengbin13
In pf_init_units, if blk_mq_init_sq_queue fails, need to set queue to
NULL before put_disk, otherwise null-ptr-deref Read will occur.
put_disk
kobject_put
disk_release
blk_put_queue(disk->queue)
Fixes: 77218ddf46d8 ("paride: convert pf to blk-mq")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
---
drivers/block/paride/pf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 1e9c50a..6b7d4ca 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -300,8 +300,8 @@ static void __init pf_init_units(void)
disk->queue = blk_mq_init_sq_queue(&pf->tag_set, &pf_mq_ops,
1, BLK_MQ_F_SHOULD_MERGE);
if (IS_ERR(disk->queue)) {
- put_disk(disk);
disk->queue = NULL;
+ put_disk(disk);
continue;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] paride/pf: need to set queue to NULL before put_disk
2019-08-13 8:59 ` [PATCH] paride/pf: " zhengbin
@ 2019-09-04 8:49 ` zhengbin (A)
2019-09-04 13:00 ` Jens Axboe
1 sibling, 0 replies; 4+ messages in thread
From: zhengbin (A) @ 2019-09-04 8:49 UTC (permalink / raw)
To: tim, axboe, linux-block; +Cc: yi.zhang
ping
On 2019/8/13 16:59, zhengbin wrote:
> In pf_init_units, if blk_mq_init_sq_queue fails, need to set queue to
> NULL before put_disk, otherwise null-ptr-deref Read will occur.
>
> put_disk
> kobject_put
> disk_release
> blk_put_queue(disk->queue)
>
> Fixes: 77218ddf46d8 ("paride: convert pf to blk-mq")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> ---
> drivers/block/paride/pf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
> index 1e9c50a..6b7d4ca 100644
> --- a/drivers/block/paride/pf.c
> +++ b/drivers/block/paride/pf.c
> @@ -300,8 +300,8 @@ static void __init pf_init_units(void)
> disk->queue = blk_mq_init_sq_queue(&pf->tag_set, &pf_mq_ops,
> 1, BLK_MQ_F_SHOULD_MERGE);
> if (IS_ERR(disk->queue)) {
> - put_disk(disk);
> disk->queue = NULL;
> + put_disk(disk);
> continue;
> }
>
> --
> 2.7.4
>
>
> .
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] paride/pf: need to set queue to NULL before put_disk
2019-08-13 8:59 ` [PATCH] paride/pf: " zhengbin
2019-09-04 8:49 ` zhengbin (A)
@ 2019-09-04 13:00 ` Jens Axboe
1 sibling, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2019-09-04 13:00 UTC (permalink / raw)
To: zhengbin, tim, linux-block; +Cc: yi.zhang
On 8/13/19 2:59 AM, zhengbin wrote:
> In pf_init_units, if blk_mq_init_sq_queue fails, need to set queue to
> NULL before put_disk, otherwise null-ptr-deref Read will occur.
>
> put_disk
> kobject_put
> disk_release
> blk_put_queue(disk->queue)
Thanks, applied.
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-04 13:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-13 8:59 [PATCH] paride/pfd: need to set queue to NULL before put_disk zhengbin
2019-08-13 8:59 ` [PATCH] paride/pf: " zhengbin
2019-09-04 8:49 ` zhengbin (A)
2019-09-04 13:00 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).