git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
net
/
ipv6
/
netfilter
/
ip6t_owner.c
diff --git
a/net/ipv6/netfilter/ip6t_owner.c
b/net/ipv6/netfilter/ip6t_owner.c
index
0bb9c66
..
272257b
100644
(file)
--- a/
net/ipv6/netfilter/ip6t_owner.c
+++ b/
net/ipv6/netfilter/ip6t_owner.c
@@
-143,7
+143,14
@@
checkentry(const char *tablename,
if (matchsize != IP6T_ALIGN(sizeof(struct ip6t_owner_info)))
return 0;
if (matchsize != IP6T_ALIGN(sizeof(struct ip6t_owner_info)))
return 0;
-
+#ifdef CONFIG_SMP
+ /* files->file_lock can not be used in a BH */
+ if (((struct ip6t_owner_info *)matchinfo)->match
+ & (IP6T_OWNER_PID|IP6T_OWNER_SID)) {
+ printk("ip6t_owner: pid and sid matching is broken on SMP.\n");
+ return 0;
+ }
+#endif
return 1;
}
return 1;
}