Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbb427e3 authored by Bart Van Assche's avatar Bart Van Assche Committed by Tejun Heo
Browse files

blkcg: Unlock blkcg_pol_mutex only once when cpd == NULL 



Unlocking a mutex twice is wrong. Hence modify blkcg_policy_register()
such that blkcg_pol_mutex is unlocked once if cpd == NULL. This patch
avoids that smatch reports the following error:

block/blk-cgroup.c:1378: blkcg_policy_register() error: double unlock 'mutex:&blkcg_pol_mutex'

Fixes: 06b285bd ("blkcg: fix blkcg_policy_data allocation bug")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: <stable@vger.kernel.org> # v4.2+
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent e0223003

block/blk-cgroup.c

+1 −3
Original line number Diff line number Diff line
@@ -1340,10 +1340,8 @@ int blkcg_policy_register(struct blkcg_policy *pol) 
			struct blkcg_policy_data *cpd;



			cpd = pol->cpd_alloc_fn(GFP_KERNEL);

			if (!cpd) {

				mutex_unlock(&blkcg_pol_mutex);

			if (!cpd)

				goto err_free_cpds;

			}



			blkcg->cpd[pol->plid] = cpd;

			cpd->blkcg = blkcg;