rbd: Avoid calling BUG() when object_map is not empty
diff mbox series

Message ID 20191215163527.25203-1-pakki001@umn.edu
State New
Headers show
Series
  • rbd: Avoid calling BUG() when object_map is not empty
Related show

Commit Message

Aditya Pakki Dec. 15, 2019, 4:35 p.m. UTC
In __rbd_object_map_load, if object_map contains data, return
error -EINVAL upstream, instead of crashing, via BUG. The patch
fixes this issue.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
 drivers/block/rbd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Markus Elfring Dec. 15, 2019, 10 p.m. UTC | #1
> The patch fixes this issue.

Will the tag “Fixes” be more helpful than this sentence?

Regards,
Markus
Ilya Dryomov Dec. 16, 2019, 10:18 a.m. UTC | #2
On Sun, Dec 15, 2019 at 5:35 PM Aditya Pakki <pakki001@umn.edu> wrote:
>
> In __rbd_object_map_load, if object_map contains data, return
> error -EINVAL upstream, instead of crashing, via BUG. The patch
> fixes this issue.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
>  drivers/block/rbd.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 2b184563cd32..6e9a11f32a94 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -1892,7 +1892,8 @@ static int __rbd_object_map_load(struct rbd_device *rbd_dev)
>         int num_pages;
>         int ret;
>
> -       rbd_assert(!rbd_dev->object_map && !rbd_dev->object_map_size);
> +       if (rbd_dev->object_map || rbd_dev->object_map_size)
> +               return -EINVAL;
>
>         num_objects = ceph_get_num_objects(&rbd_dev->layout,
>                                            rbd_dev->mapping.size);

Hi Aditya,

Could you explain what issue is being fixed?  Did you hit this assert?
If so, under what circumstances?  The fact that __rbd_object_map_load()
can fail doesn't mean that it shouldn't have asserts...

Thanks,

                Ilya

Patch
diff mbox series

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 2b184563cd32..6e9a11f32a94 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1892,7 +1892,8 @@  static int __rbd_object_map_load(struct rbd_device *rbd_dev)
 	int num_pages;
 	int ret;
 
-	rbd_assert(!rbd_dev->object_map && !rbd_dev->object_map_size);
+	if (rbd_dev->object_map || rbd_dev->object_map_size)
+		return -EINVAL;
 
 	num_objects = ceph_get_num_objects(&rbd_dev->layout,
 					   rbd_dev->mapping.size);