From patchwork Sun Mar 1 22:00:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 23917 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BF76FDDE1C for ; Mon, 2 Mar 2009 09:01:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756034AbZCAWA7 (ORCPT ); Sun, 1 Mar 2009 17:00:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755853AbZCAWA7 (ORCPT ); Sun, 1 Mar 2009 17:00:59 -0500 Received: from mail-ew0-f177.google.com ([209.85.219.177]:43804 "EHLO mail-ew0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755488AbZCAWA6 (ORCPT ); Sun, 1 Mar 2009 17:00:58 -0500 Received: by ewy25 with SMTP id 25so1878565ewy.37 for ; Sun, 01 Mar 2009 14:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=ew0V5lHhLJeea0Xf/HmGhfZU9T/mSedL7AEYbXgkvKs=; b=VEqPt8FDj1TFhtZSPKj0Ixtv8jjC2tP5tqiBKAks1qWG0yuH4zArewdQm7YM6JfEYA YgNDqbzhMBoPfvJbTOxTFC7h68AHl8xYLfWEZ8iJOevS960faxPIn1DFWSMrloRMajKu TvGy0tee+YM04eOi6gkzmp9ma1rCc16+fbt8Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=ty4gDq7I7xKjprY/fwWdHu6rcHV4VfrXUCjUAixYrWJVaVOy45QeZd0WARs04YvBom Y4Sf07M8NVsfW/58RDON/F9lTEb5D+GzbT7sz5v7ssoVSwcuHIfUKUF1dBFkOmey5gU7 dH/GmlzXeGLoH+Otgho4LcchRijL9vHQmR9UU= Received: by 10.210.57.12 with SMTP id f12mr2627671eba.51.1235944855745; Sun, 01 Mar 2009 14:00:55 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 5sm97171eyf.32.2009.03.01.14.00.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 01 Mar 2009 14:00:55 -0800 (PST) Message-ID: <49AB0599.4010008@gmail.com> Date: Sun, 01 Mar 2009 23:00:57 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: acme@redhat.com CC: netdev@vger.kernel.org, "David S. Miller" , Andrew Morton Subject: [PATCH] [SK_BUFF]: '< 0' and '>= 0' test on unsigned Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- -- 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 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++;