lkml.org 
[lkml]   [2019]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] rbd: Avoid calling BUG() when object_map is not empty
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

\
 
 \ /
  Last update: 2019-12-16 11:19    [W:0.035 / U:2.652 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site