Re: [PATCH] libceph: fix ceph_msg_new error path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Applied, thanks!

On Tue, 3 May 2011, Henry C Chang wrote:

> If memory allocation failed, calling ceph_msg_put() will cause GPF
> since some of ceph_msg variables are not initialized first.
> 
> Fix Bug #970.
> 
> Signed-off-by: Henry C Chang <henry_c_chang@xxxxxxxxxxxxxxxxxxx>
> ---
>  net/ceph/messenger.c |   26 +++++++++++++-------------
>  1 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
> index 05f3578..e15a82c 100644
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@ -2267,6 +2267,19 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags)
>  	m->more_to_follow = false;
>  	m->pool = NULL;
>  
> +	/* middle */
> +	m->middle = NULL;
> +
> +	/* data */
> +	m->nr_pages = 0;
> +	m->page_alignment = 0;
> +	m->pages = NULL;
> +	m->pagelist = NULL;
> +	m->bio = NULL;
> +	m->bio_iter = NULL;
> +	m->bio_seg = 0;
> +	m->trail = NULL;
> +
>  	/* front */
>  	if (front_len) {
>  		if (front_len > PAGE_CACHE_SIZE) {
> @@ -2286,19 +2299,6 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags)
>  	}
>  	m->front.iov_len = front_len;
>  
> -	/* middle */
> -	m->middle = NULL;
> -
> -	/* data */
> -	m->nr_pages = 0;
> -	m->page_alignment = 0;
> -	m->pages = NULL;
> -	m->pagelist = NULL;
> -	m->bio = NULL;
> -	m->bio_iter = NULL;
> -	m->bio_seg = 0;
> -	m->trail = NULL;
> -
>  	dout("ceph_msg_new %p front %d\n", m, front_len);
>  	return m;
>  
> -- 
> 1.7.2.3
> 
> --
> 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


[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux