From 15182511a0ebc0e8081e13bb05c3dadf34ad0e14 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 6 Aug 2006 22:22:47 -0700
Subject: [PATCH] --- yaml --- r: 34429 b: refs/heads/master c:
 6c813a7297e3af4cd7c3458e09e9ee3d161c6830 h: refs/heads/master i:   34427:
 089d660b32463c5cd3f63711ae604ff389aa86da v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b334cad3508f..669c15475d61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7aba67f814729647c938ac6da2d5224b790f926
+refs/heads/master: 6c813a7297e3af4cd7c3458e09e9ee3d161c6830
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index ff5affe2636c..41c5905d3191 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1223,6 +1223,9 @@ int ip6_del_rt(struct rt6_info *rt, struct nlmsghdr *nlh, void *_rtattr, struct
 	int err;
 	struct fib6_table *table;
 
+	if (rt == &ip6_null_entry)
+		return -ENOENT;
+
 	table = rt->rt6i_table;
 	write_lock_bh(&table->tb6_lock);