From: Jason Baron Date: Wed, 2 Jul 2014 15:52:44 +0000 (+0000) Subject: sched: Fix static_key race with sched_feat() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5cd08fbfdb6baa9fe98f530b76898fc5725a6289;p=openwrt%2Fstaging%2Fblogic.git sched: Fix static_key race with sched_feat() As pointed out by Andi Kleen, the usage of static keys can be racy in sched_feat_disable() vs. sched_feat_enable(). Currently, we first check the value of keys->enabled, and subsequently update the branch direction. This, can be racy and can potentially leave the keys in an inconsistent state. Take the i_mutex around these calls to resolve the race. Reported-by: Andi Kleen Signed-off-by: Jason Baron Signed-off-by: Peter Zijlstra Cc: Linus Torvalds Cc: rostedt@goodmis.org Link: http://lkml.kernel.org/r/9d7780c83db26683955cd01e6bc654ee2586e67f.1404315388.git.jbaron@akamai.com Signed-off-by: Ingo Molnar --- diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2f960813c582..8705125bb9b1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -245,6 +245,7 @@ sched_feat_write(struct file *filp, const char __user *ubuf, char buf[64]; char *cmp; int i; + struct inode *inode; if (cnt > 63) cnt = 63; @@ -255,7 +256,11 @@ sched_feat_write(struct file *filp, const char __user *ubuf, buf[cnt] = 0; cmp = strstrip(buf); + /* Ensure the static_key remains in a consistent state */ + inode = file_inode(filp); + mutex_lock(&inode->i_mutex); i = sched_feat_set(cmp); + mutex_unlock(&inode->i_mutex); if (i == __SCHED_FEAT_NR) return -EINVAL;