This is a note to let you know that I've just added the patch titled blkcg: Unlock blkcg_pol_mutex only once when cpd == NULL to the 4.8-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: blkcg-unlock-blkcg_pol_mutex-only-once-when-cpd-null.patch and it can be found in the queue-4.8 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From bbb427e342495df1cda10051d0566388697499c0 Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> Date: Thu, 29 Sep 2016 08:33:30 -0700 Subject: blkcg: Unlock blkcg_pol_mutex only once when cpd == NULL From: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> commit bbb427e342495df1cda10051d0566388697499c0 upstream. 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: 06b285bd1125 ("blkcg: fix blkcg_policy_data allocation bug") Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- block/blk-cgroup.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1340,10 +1340,8 @@ int blkcg_policy_register(struct blkcg_p 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; Patches currently in stable-queue which might be from bart.vanassche@xxxxxxxxxxx are queue-4.8/ib-srp-fix-infinite-loop-when-fmr-sg.offset-0.patch queue-4.8/dm-rq-take-request_queue-lock-while-clearing-queue_flag_stopped.patch queue-4.8/ib-core-correctly-handle-rdma_rw_init_mrs-failure.patch queue-4.8/dm-mark-request_queue-dead-before-destroying-the-dm-device.patch queue-4.8/dm-mpath-check-if-path-s-request_queue-is-dying-in-activate_path.patch queue-4.8/blkcg-unlock-blkcg_pol_mutex-only-once-when-cpd-null.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