af_rose/x25: Sanity check the maximum user frame size
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Fri, 27 Mar 2009 07:28:21 +0000 (00:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Mar 2009 07:28:21 +0000 (00:28 -0700)
Otherwise we can wrap the sizes and end up sending garbage.

Closes #10423

Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netrom/af_netrom.c
net/rose/af_rose.c
net/x25/af_x25.c

index 6d9c58ec56ac70193adb3cddcb2ef0968ee1906c..d1c16bbee9326b7f3cbce9421e276310dffa4d2e 100644 (file)
@@ -1086,7 +1086,11 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock,
 
        SOCK_DEBUG(sk, "NET/ROM: sendto: Addresses built.\n");
 
-       /* Build a packet */
+       /* Build a packet - the conventional user limit is 236 bytes. We can
+          do ludicrously large NetROM frames but must not overflow */
+       if (len > 65536)
+               return -EMSGSIZE;
+
        SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n");
        size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN;
 
index 6501396265819eec021f89eade0f4f7e1551bdfe..0f36e8d59b29c563bfae1f6421c9d5d2a5ddeb44 100644 (file)
@@ -1124,6 +1124,10 @@ static int rose_sendmsg(struct kiocb *iocb, struct socket *sock,
 
        /* Build a packet */
        SOCK_DEBUG(sk, "ROSE: sendto: building packet.\n");
+       /* Sanity check the packet size */
+       if (len > 65535)
+               return -EMSGSIZE;
+
        size = len + AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN;
 
        if ((skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT, &err)) == NULL)
index 9ca17b1ce52e8191f04b401e2f0a1e021062badf..ed80af8ca5fb86f018c2421467d497d084fe73ba 100644 (file)
@@ -1035,6 +1035,12 @@ static int x25_sendmsg(struct kiocb *iocb, struct socket *sock,
                sx25.sx25_addr   = x25->dest_addr;
        }
 
+       /* Sanity check the packet size */
+       if (len > 65535) {
+               rc = -EMSGSIZE;
+               goto out;
+       }
+
        SOCK_DEBUG(sk, "x25_sendmsg: sendto: Addresses built.\n");
 
        /* Build a packet */