Re: Patch "cgroup: fix umount vs cgroup_cfts_commit() race" has been added to the 3.10-stable tree

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

 



Hi Greg,

> --- a/kernel/cgroup.c
> +++ b/kernel/cgroup.c
> @@ -2769,13 +2769,17 @@ static void cgroup_cfts_commit(struct cg
>  {
>  	LIST_HEAD(pending);
>  	struct cgroup *cgrp, *n;
> +	struct super_block *sb = ss->root->sb;
>  
>  	/* %NULL @cfts indicates abort and don't bother if @ss isn't attached */
> -	if (cfts && ss->root != &rootnode) {
> +	if (cfts && ss->root != &rootnode &&
> +	    atomic_inc_not_zero(sb->s_active)) {

You can either change (sb->s_active) to (&sb->s_active), or you can apply
the backport I sent a few days ago:

www.spinics.net/lists/stable/msg14543.html

Otherwise this won't compile...

>  		list_for_each_entry(cgrp, &ss->root->allcg_list, allcg_node) {
>  			dget(cgrp->dentry);
>  			list_add_tail(&cgrp->cft_q_node, &pending);
>  		}
> +	} else {
> +		sb = NULL;
>  	}
>  
>  	mutex_unlock(&cgroup_mutex);
> @@ -2798,6 +2802,9 @@ static void cgroup_cfts_commit(struct cg
>  		dput(cgrp->dentry);
>  	}
>  
> +	if (sb)
> +		deactivate_super(sb);
> +
>  	mutex_unlock(&cgroup_cft_mutex);
>  }
>  
> 
> 
> Patches currently in stable-queue which might be from lizefan@xxxxxxxxxx are
> 
> queue-3.10/cgroup-fix-umount-vs-cgroup_cfts_commit-race.patch
> --
> To unsubscribe from this list: send the line "unsubscribe stable" 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 stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]