From c933b77f2cb4706c23bd951c56f5ea051aac9943 Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Mon, 10 Apr 2006 16:43:03 -0700
Subject: [PATCH] --- yaml --- r: 25672 b: refs/heads/master c:
 b8282dcf0417bbc8a0786c129fdff9cc768f8f3c h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/dccp/ipv4.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c80fc6fca951..d95c4d1d2113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7595b4955b5178e28906838cc3e8efa62d8caee
+refs/heads/master: b8282dcf0417bbc8a0786c129fdff9cc768f8f3c
diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c
index 29047995c695..f2c011fd2ba1 100644
--- a/trunk/net/dccp/ipv4.c
+++ b/trunk/net/dccp/ipv4.c
@@ -498,7 +498,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
 		goto drop;
 
 	if (dccp_parse_options(sk, skb))
-		goto drop;
+		goto drop_and_free;
 
 	dccp_openreq_init(req, &dp, skb);