From: Greg Kroah-Hartman Date: Wed, 7 Mar 2007 02:02:14 +0000 (-0800) Subject: remove netlink patch that doesn't build X-Git-Tag: v2.6.20.2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfddffb85d2ec1ac14a1dd89e579be000ccc3523;p=thirdparty%2Fkernel%2Fstable-queue.git remove netlink patch that doesn't build --- diff --git a/queue-2.6.20/nfnetlink_log_null_deref_fix.patch.patch b/queue-2.6.20/nfnetlink_log_null_deref_fix.patch.patch deleted file mode 100644 index 43f16be9acd..00000000000 --- a/queue-2.6.20/nfnetlink_log_null_deref_fix.patch.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Michał Mirosław -Subject: Eliminate possible NULL pointer dereference in nfulnl_recv_config(). - -Eliminate possible NULL pointer dereference in nfulnl_recv_config(). - -Signed-off-by: Michał Mirosław -Signed-off-by: Greg Kroah-Hartman - ---- - net/netfilter/nfnetlink_log.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- linux-2.6.20.1.orig/net/netfilter/nfnetlink_log.c -+++ linux-2.6.20.1/net/netfilter/nfnetlink_log.c -@@ -865,6 +865,9 @@ nfulnl_recv_config(struct sock *ctnl, st - ret = -EINVAL; - break; - } -+ -+ if (!inst) -+ goto out_null; - } else { - if (!inst) { - UDEBUG("no config command, and no instance for " diff --git a/queue-2.6.20/series b/queue-2.6.20/series index dd57623965e..ac1a510c39a 100644 --- a/queue-2.6.20/series +++ b/queue-2.6.20/series @@ -70,7 +70,6 @@ fix-tcp-md5-locking.patch don-t-add-anycast-reference-to-device-multiple-times.patch fix-anycast-procfs-device-leak.patch nfnetlink_log_refcounting_fix.patch.patch -nfnetlink_log_null_deref_fix.patch.patch md_md5_6_bio_too_big_fix_fix.patch jfs_fix_deadlock.patch forcedeth-disable-msix.patch