Skip to contentSkip to conversation

af_rose/x25: Sanity check the maximum user frame size

PATCH Applied Alan Cox 2 participants 2 messages Mar 26, 2009 – Mar 27, 2009

Subsystems (3)
lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 af_rose/x25: Sanity check the maximum user frame size

Otherwise we can wrap the sizes and end up sending garbage.

Closes #10423

---

 net/netrom/af_netrom.c |    6 +++++-
 net/rose/af_rose.c     |    4 ++++
 net/x25/af_x25.c       |    6 ++++++
 3 files changed, 15 insertions(+), 1 deletions(-)
net/netrom/af_netrom.c +5 -1
index e9c05b8..29953b0 100644
@@ -1082,7 +1082,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;
 
net/rose/af_rose.c +4 -0
index 0139264..5e75bbf 100644
@@ -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)
net/x25/af_x25.c +6 -0
index 9fc5b02..88d80f5 100644
@@ -1037,6 +1037,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 */
maintainer Applied
#1 lore raw

From: Alan Cox <[email protected]>
Date: Thu, 26 Mar 2009 21:58:51 +0000

Quoted 5 lines

Otherwise we can wrap the sizes and end up sending garbage.

Closes #10423

Applied, but:

net/netrom/af_netrom.c static int nr_sendmsg(struct kiocb *iocb, struct socket *sock, · line 1089

Quoted 6 lines
net/netrom/af_netrom.c +5 -1
-	/* 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;
+	

^^^^^^^^^^^^^

please fix the tab monster :-) Or, alternatively, check the patch either with GIT's automatic checks (or using checkpatch.pl if you haven't eaten recently)