Message ID | 1304960976.19586.51.camel@Joe-Laptop |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On 05/09/2011 12:09 PM, Joe Perches wrote: > On Mon, 2011-05-09 at 11:02 -0500, Larry Finger wrote: >> On 05/09/2011 12:43 AM, Joe Perches wrote: >>> Found via coccinelle script >>> @@ >>> type T; >>> T* ptr; >>> expression E1; >>> @@ >>> * memset(E1, 0, sizeof(ptr)); >>> Signed-off-by: Joe Perches<joe@perches.com> >>> --- >>> drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- >>> 1 files changed, 1 insertions(+), 1 deletions(-) >>> >>> diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c >>> @@ -372,7 +372,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) > [] >>> + memset(rx_status, 0, sizeof(*rx_status)); >> ACK. > > Hey Larry. > > If this is correct, then probably the memcpy at the > end of the routine needs conversion too. > > --- > > drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c > index 79c98f6..3a92ba3 100644 > --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c > +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c > @@ -372,7 +372,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) > __le16 fc; > struct ieee80211_hdr *hdr; > > - memset(rx_status, 0, sizeof(rx_status)); > + memset(rx_status, 0, sizeof(*rx_status)); > rxdesc = skb->data; > skb_len = skb->len; > drvinfo_len = (GET_RX_DESC_DRVINFO_SIZE(rxdesc) * RTL_RX_DRV_INFO_UNIT); > @@ -434,7 +434,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) > "0x%02X\n", fc, (u32)hdr->addr1[0], (u32)hdr->addr1[1], > (u32)hdr->addr1[2], (u32)hdr->addr1[3], (u32)hdr->addr1[4], > (u32)hdr->addr1[5])); > - memcpy(IEEE80211_SKB_RXCB(skb),&rx_status, sizeof(rx_status)); > + memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status)); > ieee80211_rx_irqsafe(hw, skb); > } Yes it does. After you posted V1 of the patch, I reviewed all the sizeof() calls in the rtlwifi tree and found the second one at line 437. ACK for V2 once the commit message is fixed. Larry -- 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/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c index 79c98f6..3a92ba3 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c @@ -372,7 +372,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) __le16 fc; struct ieee80211_hdr *hdr; - memset(rx_status, 0, sizeof(rx_status)); + memset(rx_status, 0, sizeof(*rx_status)); rxdesc = skb->data; skb_len = skb->len; drvinfo_len = (GET_RX_DESC_DRVINFO_SIZE(rxdesc) * RTL_RX_DRV_INFO_UNIT); @@ -434,7 +434,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) "0x%02X\n", fc, (u32)hdr->addr1[0], (u32)hdr->addr1[1], (u32)hdr->addr1[2], (u32)hdr->addr1[3], (u32)hdr->addr1[4], (u32)hdr->addr1[5])); - memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status)); + memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status)); ieee80211_rx_irqsafe(hw, skb); }