[Ocfs2-tools-devel] ocfs2_controld: Fix bad memcpy in cpg.c

[Joel Becker]

On Fri, Dec 10, 2010 at 12:11:20PM -0800, Mark Fasheh wrote:
> The memcpy into cg_members in process_configuration_change was copying a number of bytes
> equal to the size of the cg_cb_members pointer, not the total size of the
> array.
> 
> Reported-by: Tim Serong <tserong at novell.com>
> Signed-off-by: Mark Fasheh <mfasheh at suse.com>

Acked-by: Joel Becker <joel.becker at Oracle.com>

> ---
>  ocfs2_controld/cpg.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/ocfs2_controld/cpg.c b/ocfs2_controld/cpg.c
> index 5ac7e9a..533451f 100644
> --- a/ocfs2_controld/cpg.c
> +++ b/ocfs2_controld/cpg.c
> @@ -435,7 +435,7 @@ static void daemon_change(struct cgroup *cg)
>  static void process_configuration_change(struct cgroup *cg)
>  {
>  	memcpy(&cg->cg_members, &cg->cg_cb_members,
> -	       sizeof(&cg->cg_cb_members));
> +	       sizeof(cg->cg_cb_members));
>  	cg->cg_member_count = cg->cg_cb_member_count;
>  
>  	if (cg == &daemon_group)
> -- 
> 1.6.4.2
> 
> 
> _______________________________________________
> Ocfs2-tools-devel mailing list
> Ocfs2-tools-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-tools-devel

-- 

"Also, all of life's big problems include the words 'indictment' or
	'inoperable.' Everything else is small stuff."
	- Alton Brown

Joel Becker
Senior Development Manager
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127