diff options
| author | Chuck Lever | 2007-11-11 06:53:30 +0100 |
|---|---|---|
| committer | David S. Miller | 2007-11-11 06:53:30 +0100 |
| commit | 78608ba0326f1448f9a10dbb402a38192559f639 (patch) | |
| tree | beed02e8e886be6a9661e9eb6ca60cc1208c59d2 | |
| parent | [VLAN]: Allow setting mac address while device is up (diff) | |
| download | kernel-qcow2-linux-78608ba0326f1448f9a10dbb402a38192559f639.tar.gz kernel-qcow2-linux-78608ba0326f1448f9a10dbb402a38192559f639.tar.xz kernel-qcow2-linux-78608ba0326f1448f9a10dbb402a38192559f639.zip | |
[NET]: Fix skb_truesize_check() assertion
The intent of the assertion in skb_truesize_check() is to check
for skb->truesize being decremented too much by other code,
resulting in a wraparound below zero.
The type of the right side of the comparison causes the compiler to
promote the left side to an unsigned type, despite the presence of an
explicit type cast. This defeats the check for negativity.
Ensure both sides of the comparison are a signed type to prevent the
implicit type conversion.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/skbuff.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 94e49915a8c0..91140fe8c119 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -387,7 +387,9 @@ extern void skb_truesize_bug(struct sk_buff *skb); static inline void skb_truesize_check(struct sk_buff *skb) { - if (unlikely((int)skb->truesize < sizeof(struct sk_buff) + skb->len)) + int len = sizeof(struct sk_buff) + skb->len; + + if (unlikely((int)skb->truesize < len)) skb_truesize_bug(skb); } |