[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B44FE3C.6060809@gmail.com>
Date: Wed, 06 Jan 2010 16:18:52 -0500
From: William Allen Simpson <william.allen.simpson@...il.com>
To: Linux Kernel Developers <linux-kernel@...r.kernel.org>
CC: Linux Kernel Network Developers <netdev@...r.kernel.org>,
Michael Chan <mchan@...adcom.com>
Subject: [PATCH 0/2] net: replace buggy tcp_optlen, and cleanup
This bugginess was reported in October, November, December, and
January. I'm requesting some independent review and testing.
The tcp_optlen() function returns a potential *negative* unsigned:
-static inline unsigned int tcp_optlen(const struct sk_buff *skb)
-{
- return (tcp_hdr(skb)->doff - 5) * 4;
-}
-
This is replaced by tcp_header_len_th() and tcp_option_len_th().
The tcp_optlen() function is used *only* in two drivers, that
also have rather messy coding practices; such as:
- if ((mss = skb_shinfo(skb)->gso_size)) {
...
- } else
- mss = 0;
Or:
- mss = 0;
- if ((mss = skb_shinfo(skb)->gso_size) != 0) {
Or:
- iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
- hdrlen = ip_tcp_len + tcp_opt_len;
Or mixing word and byte sized variables, without using defined constants
or useful sizeof() to make the code self-documenting:
- if (tcp_opt_len || (iph->ihl > 5)) {
- vlan_tag_flags |= ((iph->ihl - 5) +
- (tcp_opt_len >> 2)) << 8;
- }
Stand-alone patch, originally developed for TCPCT.
Signed-off-by: William.Allen.Simpson@...il.com
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists