Reviewed-by: Yehuda Sadeh <yehuda@xxxxxxxxxxx>
On Fri, Aug 24, 2012 at 9:32 AM, Alex Elder <elder@xxxxxxxxxxx> wrote:
> In rbd_header_from_disk() the object prefix buffer is sized based on
> the maximum size it's block_name equivalent on disk could be.
>
> Instead, only allocate enough to hold NUL-terminated string from
> the on-disk header--or the maximum size of no NUL is found.
>
> Signed-off-by: Alex Elder <elder@xxxxxxxxxxx>
> ---
> drivers/block/rbd.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 81b5344..a8a4cba 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -519,18 +519,19 @@ static int rbd_header_from_disk(struct
> rbd_image_header *header,
> struct rbd_image_header_ondisk *ondisk)
> {
> u32 snap_count;
> + size_t len;
> size_t size;
>
> memset(header, 0, sizeof (*header));
>
> snap_count = le32_to_cpu(ondisk->snap_count);
>
> - size = sizeof (ondisk->block_name) + 1;
> - header->object_prefix = kmalloc(size, GFP_KERNEL);
> + len = strnlen(ondisk->block_name, sizeof (ondisk->block_name));
> + header->object_prefix = kmalloc(len + 1, GFP_KERNEL);
> if (!header->object_prefix)
> return -ENOMEM;
> - memcpy(header->object_prefix, ondisk->block_name, size - 1);
> - header->object_prefix[size - 1] = '\0';
> + memcpy(header->object_prefix, ondisk->block_name, len);
> + header->object_prefix[len] = '\0';
>
> if (snap_count) {
> header->snap_names_len = le64_to_cpu(ondisk->snap_names_len);
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
