git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
[pandora-kernel.git]
/
net
/
core
/
sysctl_net_core.c
diff --git
a/net/core/sysctl_net_core.c
b/net/core/sysctl_net_core.c
index
01eee5d
..
385b609
100644
(file)
--- a/
net/core/sysctl_net_core.c
+++ b/
net/core/sysctl_net_core.c
@@
-34,7
+34,8
@@
static int rps_sock_flow_sysctl(ctl_table *table, int write,
mutex_lock(&sock_flow_mutex);
mutex_lock(&sock_flow_mutex);
- orig_sock_table = rps_sock_flow_table;
+ orig_sock_table = rcu_dereference_protected(rps_sock_flow_table,
+ lockdep_is_held(&sock_flow_mutex));
size = orig_size = orig_sock_table ? orig_sock_table->mask + 1 : 0;
ret = proc_dointvec(&tmp, write, buffer, lenp, ppos);
size = orig_size = orig_sock_table ? orig_sock_table->mask + 1 : 0;
ret = proc_dointvec(&tmp, write, buffer, lenp, ppos);