commit fb8ef90d79381888e80bd6ff3394908d0683ed91
Author: Jan Rękorajski <[email protected]>
Date: Thu Feb 20 13:53:42 2014 +0100
- fix NULL pointer dereference in netlink_seq_next
- rel 2
kernel-vserver-2.3.patch | 8 ++++----
kernel.spec | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 40047b1..819d33d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@
%define have_pcmcia 0
%endif
-%define rel 1
+%define rel 2
%define basever 3.13
%define postver .3
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index ee514f6..9a02699 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -24880,8 +24880,8 @@ diff -NurpP --minimal
linux-3.13.1/net/netlink/af_netlink.c linux-3.13.1-vs2.3.6
do {
s = sk_next(s);
- } while (s && !nl_table[s->sk_protocol].compare(net, s));
-+ } while ((s && !nl_table[s->sk_protocol].compare(net, s)) ||
-+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT));
++ } while (s && (!nl_table[s->sk_protocol].compare(net, s) ||
++ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)));
if (s)
return s;
@@ -24890,8 +24890,8 @@ diff -NurpP --minimal
linux-3.13.1/net/netlink/af_netlink.c linux-3.13.1-vs2.3.6
s = sk_head(&hash->table[j]);
- while (s && !nl_table[s->sk_protocol].compare(net, s))
-+ while ((s && !nl_table[s->sk_protocol].compare(net, s))
||
-+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++ while (s && (!nl_table[s->sk_protocol].compare(net, s)
||
++ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)))
s = sk_next(s);
if (s) {
iter->link = i;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/fb8ef90d79381888e80bd6ff3394908d0683ed91
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
