From: Roel Kluin Date: Tue, 2 Dec 2008 23:06:39 +0000 (+0100) Subject: Staging: wlan-ng: skb_p80211_to_ether() - payload_length is unsigned, check before... X-Git-Tag: v2.6.29-rc1~228^2~153 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1f9e9ce1f99e89ee180a3994c44bdff43ebeb139;p=linux-2.6-omap-h63xx.git Staging: wlan-ng: skb_p80211_to_ether() - payload_length is unsigned, check before subtraction payload_length is unsigned, check before subtraction Signed-off-by: Roel Kluin --- diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index 993e8f48073..dfc7b3a1e9c 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c @@ -328,11 +328,11 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb memcpy(saddr, w_hdr->a3.a2, WLAN_ETHADDR_LEN); } else { payload_offset = WLAN_HDR_A4_LEN; - payload_length -= ( WLAN_HDR_A4_LEN - WLAN_HDR_A3_LEN ); - if (payload_length < 0 ) { + if (payload_length < WLAN_HDR_A4_LEN - WLAN_HDR_A3_LEN) { WLAN_LOG_ERROR("A4 frame too short!\n"); return 1; } + payload_length -= (WLAN_HDR_A4_LEN - WLAN_HDR_A3_LEN); memcpy(daddr, w_hdr->a4.a3, WLAN_ETHADDR_LEN); memcpy(saddr, w_hdr->a4.a4, WLAN_ETHADDR_LEN); }