From df66419e57a8e0ff5e659fa6f129165bec505c87 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 14 Jul 2006 14:49:32 -0700
Subject: [PATCH] --- yaml --- r: 32679 b: refs/heads/master c:
 53602f92dd3691616478a40738353694bcfef171 h: refs/heads/master i:   32677:
 4a9a6fcb7413586a76619504a5d76ab01fa25415   32675:
 fd3734d255b5cbfc4ea4c1cddc7d7f618a81fac1   32671:
 bffff5b169a37aa8059a13a121dd0ffe3079be02 v: v3

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

diff --git a/[refs] b/[refs]
index c3ba73166261..230f58192793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27b437c8b7d519aac70a0254c2e04c29eff565a2
+refs/heads/master: 53602f92dd3691616478a40738353694bcfef171
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
index e1a7dba2fa8a..184c78ca79e6 100644
--- a/trunk/net/ipv4/ip_input.c
+++ b/trunk/net/ipv4/ip_input.c
@@ -428,6 +428,9 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
 		goto drop;
 	}
 
+	/* Remove any debris in the socket control block */
+	memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
+
 	return NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, dev, NULL,
 		       ip_rcv_finish);