libceph: handle OSD op ceph_pagelist_append() errors
diff mbox series

Message ID 20190703155920.2809-1-ddiss@suse.de
State New
Headers show
Series
  • libceph: handle OSD op ceph_pagelist_append() errors
Related show

Commit Message

David Disseldorp July 3, 2019, 3:59 p.m. UTC
osd_req_op_cls_init() and osd_req_op_xattr_init() currently propagate
ceph_pagelist_alloc() ENOMEM errors but ignore ceph_pagelist_append()
memory allocation failures. Add these checks and cleanup on error.

Signed-off-by: David Disseldorp <ddiss@suse.de>
---
 net/ceph/osd_client.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

Comments

Jeff Layton July 3, 2019, 4:32 p.m. UTC | #1
On Wed, 2019-07-03 at 17:59 +0200, David Disseldorp wrote:
> osd_req_op_cls_init() and osd_req_op_xattr_init() currently propagate
> ceph_pagelist_alloc() ENOMEM errors but ignore ceph_pagelist_append()
> memory allocation failures. Add these checks and cleanup on error.
> 
> Signed-off-by: David Disseldorp <ddiss@suse.de>
> ---
>  net/ceph/osd_client.c | 26 ++++++++++++++++++++++----
>  1 file changed, 22 insertions(+), 4 deletions(-)
> 
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index 9a8eca5eda65..83a7382bbe86 100644
> --- a/net/ceph/osd_client.c
> +++ b/net/ceph/osd_client.c
> @@ -849,6 +849,7 @@ int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
>  	struct ceph_pagelist *pagelist;
>  	size_t payload_len = 0;
>  	size_t size;
> +	int ret;
>  
>  	op = _osd_req_op_init(osd_req, which, CEPH_OSD_OP_CALL, 0);
>  
> @@ -860,20 +861,28 @@ int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
>  	size = strlen(class);
>  	BUG_ON(size > (size_t) U8_MAX);
>  	op->cls.class_len = size;
> -	ceph_pagelist_append(pagelist, class, size);
> +	ret = ceph_pagelist_append(pagelist, class, size);
> +	if (ret)
> +		goto err_pagelist_free;
>  	payload_len += size;
>  
>  	op->cls.method_name = method;
>  	size = strlen(method);
>  	BUG_ON(size > (size_t) U8_MAX);
>  	op->cls.method_len = size;
> -	ceph_pagelist_append(pagelist, method, size);
> +	ret = ceph_pagelist_append(pagelist, method, size);
> +	if (ret)
> +		goto err_pagelist_free;
>  	payload_len += size;
>  
>  	osd_req_op_cls_request_info_pagelist(osd_req, which, pagelist);
>  
>  	op->indata_len = payload_len;
>  	return 0;
> +
> +err_pagelist_free:
> +	ceph_pagelist_release(pagelist);
> +	return ret;
>  }
>  EXPORT_SYMBOL(osd_req_op_cls_init);
>  
> @@ -885,6 +894,7 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
>  						      opcode, 0);
>  	struct ceph_pagelist *pagelist;
>  	size_t payload_len;
> +	int ret;
>  
>  	BUG_ON(opcode != CEPH_OSD_OP_SETXATTR && opcode != CEPH_OSD_OP_CMPXATTR);
>  
> @@ -894,10 +904,14 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
>  
>  	payload_len = strlen(name);
>  	op->xattr.name_len = payload_len;
> -	ceph_pagelist_append(pagelist, name, payload_len);
> +	ret = ceph_pagelist_append(pagelist, name, payload_len);
> +	if (ret)
> +		goto err_pagelist_free;
>  
>  	op->xattr.value_len = size;
> -	ceph_pagelist_append(pagelist, value, size);
> +	ret = ceph_pagelist_append(pagelist, value, size);
> +	if (ret)
> +		goto err_pagelist_free;
>  	payload_len += size;
>  
>  	op->xattr.cmp_op = cmp_op;
> @@ -906,6 +920,10 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
>  	ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist);
>  	op->indata_len = payload_len;
>  	return 0;
> +
> +err_pagelist_free:
> +	ceph_pagelist_release(pagelist);
> +	return ret;
>  }
>  EXPORT_SYMBOL(osd_req_op_xattr_init);
>  

Good catch:

Reviewed-by: Jeff Layton <jlayton@kernel.org>

Patch
diff mbox series

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 9a8eca5eda65..83a7382bbe86 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -849,6 +849,7 @@  int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
 	struct ceph_pagelist *pagelist;
 	size_t payload_len = 0;
 	size_t size;
+	int ret;
 
 	op = _osd_req_op_init(osd_req, which, CEPH_OSD_OP_CALL, 0);
 
@@ -860,20 +861,28 @@  int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
 	size = strlen(class);
 	BUG_ON(size > (size_t) U8_MAX);
 	op->cls.class_len = size;
-	ceph_pagelist_append(pagelist, class, size);
+	ret = ceph_pagelist_append(pagelist, class, size);
+	if (ret)
+		goto err_pagelist_free;
 	payload_len += size;
 
 	op->cls.method_name = method;
 	size = strlen(method);
 	BUG_ON(size > (size_t) U8_MAX);
 	op->cls.method_len = size;
-	ceph_pagelist_append(pagelist, method, size);
+	ret = ceph_pagelist_append(pagelist, method, size);
+	if (ret)
+		goto err_pagelist_free;
 	payload_len += size;
 
 	osd_req_op_cls_request_info_pagelist(osd_req, which, pagelist);
 
 	op->indata_len = payload_len;
 	return 0;
+
+err_pagelist_free:
+	ceph_pagelist_release(pagelist);
+	return ret;
 }
 EXPORT_SYMBOL(osd_req_op_cls_init);
 
@@ -885,6 +894,7 @@  int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
 						      opcode, 0);
 	struct ceph_pagelist *pagelist;
 	size_t payload_len;
+	int ret;
 
 	BUG_ON(opcode != CEPH_OSD_OP_SETXATTR && opcode != CEPH_OSD_OP_CMPXATTR);
 
@@ -894,10 +904,14 @@  int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
 
 	payload_len = strlen(name);
 	op->xattr.name_len = payload_len;
-	ceph_pagelist_append(pagelist, name, payload_len);
+	ret = ceph_pagelist_append(pagelist, name, payload_len);
+	if (ret)
+		goto err_pagelist_free;
 
 	op->xattr.value_len = size;
-	ceph_pagelist_append(pagelist, value, size);
+	ret = ceph_pagelist_append(pagelist, value, size);
+	if (ret)
+		goto err_pagelist_free;
 	payload_len += size;
 
 	op->xattr.cmp_op = cmp_op;
@@ -906,6 +920,10 @@  int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
 	ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist);
 	op->indata_len = payload_len;
 	return 0;
+
+err_pagelist_free:
+	ceph_pagelist_release(pagelist);
+	return ret;
 }
 EXPORT_SYMBOL(osd_req_op_xattr_init);