Patchwork [SK_BUFF] : '< 0' and '>= 0' test on unsigned

login
register
mail settings
Submitter roel kluin
Date March 1, 2009, 10 p.m.
Message ID <49AB0599.4010008@gmail.com>
Download mbox | patch
Permalink /patch/23917/
State Accepted
Delegated to: David Miller
Headers show

Comments

roel kluin - March 1, 2009, 10 p.m.
struct sk_buff is located at vi include/linux/skbuff.h +357: 
maybe a different test is needed in x25_rx_call_request()?

This patch wasn't tested in any way.
------------------------------>8-------------8<---------------------------------
skb->len is an unsigned int, so the test in x25_rx_call_request() always
evaluates to true.

len in x25_sendmsg() is unsigned as well. so -ERRORS returned by x25_output()
are not noticed.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - March 13, 2009, 11:04 p.m.
From: Roel Kluin <roel.kluin@gmail.com>
Date: Sun, 01 Mar 2009 23:00:57 +0100

> struct sk_buff is located at vi include/linux/skbuff.h +357: 
> maybe a different test is needed in x25_rx_call_request()?
> 
> This patch wasn't tested in any way.
> ------------------------------>8-------------8<---------------------------------
> skb->len is an unsigned int, so the test in x25_rx_call_request() always
> evaluates to true.
> 
> len in x25_sendmsg() is unsigned as well. so -ERRORS returned by x25_output()
> are not noticed.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>

Applied to net-next-2.6, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 9fc5b02..c57a09f 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -951,10 +951,8 @@  int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
 	/*
 	 *	Incoming Call User Data.
 	 */
-	if (skb->len >= 0) {
-		skb_copy_from_linear_data(skb, makex25->calluserdata.cuddata, skb->len);
-		makex25->calluserdata.cudlength = skb->len;
-	}
+	skb_copy_from_linear_data(skb, makex25->calluserdata.cuddata, skb->len);
+	makex25->calluserdata.cudlength = skb->len;
 
 	sk->sk_ack_backlog++;
 
@@ -1122,8 +1120,9 @@  static int x25_sendmsg(struct kiocb *iocb, struct socket *sock,
 	if (msg->msg_flags & MSG_OOB)
 		skb_queue_tail(&x25->interrupt_out_queue, skb);
 	else {
-		len = x25_output(sk, skb);
-		if (len < 0)
+		rc = x25_output(sk, skb);
+		len = rc;
+		if (rc < 0)
 			kfree_skb(skb);
 		else if (x25->qbitincl)
 			len++;