Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / net / ipv4 / udp.c

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 03559b3..ec17e32 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -957,7 +957,7 @@ int udp_disconnect(struct sock *sk, int flags)
 
 static void udp_close(struct sock *sk, long timeout)
 {
-       inet_sock_release(sk);
+       sk_common_release(sk);
 }
 
 /* return:
@@ -990,6 +990,7 @@ static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
        len = skb->tail - udpdata;
 
        switch (encap_type) {
+       default:
        case UDP_ENCAP_ESPINUDP:
                /* Check if this is a keepalive packet.  If so, eat it. */
                if (len == 1 && udpdata[0] == 0xff) {
@@ -1001,34 +1002,6 @@ static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
                        /* Must be an IKE packet.. pass it through */
                        return 1;
 
-       decaps:
-               /* At this point we are sure that this is an ESPinUDP packet,
-                * so we need to remove 'len' bytes from the packet (the UDP
-                * header and optional ESP marker bytes) and then modify the
-                * protocol to ESP, and then call into the transform receiver.
-                */
-
-               /* Now we can update and verify the packet length... */
-               iph = skb->nh.iph;
-               iphlen = iph->ihl << 2;
-               iph->tot_len = htons(ntohs(iph->tot_len) - len);
-               if (skb->len < iphlen + len) {
-                       /* packet is too small!?! */
-                       return 0;
-               }
-
-               /* pull the data buffer up to the ESP header and set the
-                * transport header to point to ESP.  Keep UDP on the stack
-                * for later.
-                */
-               skb->h.raw = skb_pull(skb, len);
-
-               /* modify the protocol (it's ESP!) */
-               iph->protocol = IPPROTO_ESP;
-
-               /* and let the caller know to send this into the ESP processor... */
-               return -1;
-
        case UDP_ENCAP_ESPINUDP_NON_IKE:
                /* Check if this is a keepalive packet.  If so, eat it. */
                if (len == 1 && udpdata[0] == 0xff) {
@@ -1038,17 +1011,37 @@ static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
                        
                        /* ESP Packet with Non-IKE marker */
                        len = sizeof(struct udphdr) + 2 * sizeof(u32);
-                       goto decaps;
                } else
                        /* Must be an IKE packet.. pass it through */
                        return 1;
+       }
 
-       default:
-               if (net_ratelimit())
-                       printk(KERN_INFO "udp_encap_rcv(): Unhandled UDP encap type: %u\n",
-                              encap_type);
-               return 1;
+       /* At this point we are sure that this is an ESPinUDP packet,
+        * so we need to remove 'len' bytes from the packet (the UDP
+        * header and optional ESP marker bytes) and then modify the
+        * protocol to ESP, and then call into the transform receiver.
+        */
+
+       /* Now we can update and verify the packet length... */
+       iph = skb->nh.iph;
+       iphlen = iph->ihl << 2;
+       iph->tot_len = htons(ntohs(iph->tot_len) - len);
+       if (skb->len < iphlen + len) {
+               /* packet is too small!?! */
+               return 0;
        }
+
+       /* pull the data buffer up to the ESP header and set the
+        * transport header to point to ESP.  Keep UDP on the stack
+        * for later.
+        */
+       skb->h.raw = skb_pull(skb, len);
+
+       /* modify the protocol (it's ESP!) */
+       iph->protocol = IPPROTO_ESP;
+
+       /* and let the caller know to send this into the ESP processor... */
+       return -1;
 #endif
 }
 
@@ -1323,7 +1316,16 @@ static int udp_setsockopt(struct sock *sk, int level, int optname,
                break;
                
        case UDP_ENCAP:
-               up->encap_type = val;
+               switch (val) {
+               case 0:
+               case UDP_ENCAP_ESPINUDP:
+               case UDP_ENCAP_ESPINUDP_NON_IKE:
+                       up->encap_type = val;
+                       break;
+               default:
+                       err = -ENOPROTOOPT;
+                       break;
+               }
                break;
 
        default: