Return-path: Received: from mail2.candelatech.com ([208.74.158.173]:55752 "EHLO mail2.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756611AbdCWX01 (ORCPT ); Thu, 23 Mar 2017 19:26:27 -0400 From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Ben Greear Subject: [PATCH v3 4/4] mac80211-hwsim: add length checks before allocating skb. Date: Thu, 23 Mar 2017 16:26:18 -0700 Message-Id: <1490311578-18926-4-git-send-email-greearb@candelatech.com> (sfid-20170324_002703_074915_7FB9FBD0) In-Reply-To: <1490311578-18926-1-git-send-email-greearb@candelatech.com> References: <1490311578-18926-1-git-send-email-greearb@candelatech.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Ben Greear Modify the receive-from-user-space logic to do length and 'is-down' checks before trying to allocate an skb. And, if we are going to ignore the pkt due to radio idle, then do not return an error code to user-space. User-space cannot reliably know exactly when a radio is idle or not. Signed-off-by: Ben Greear --- drivers/net/wireless/mac80211_hwsim.c | 41 +++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 84dcddf..6207d4a 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -3074,6 +3074,7 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, int frame_data_len; void *frame_data; struct sk_buff *skb = NULL; + int rv = -EINVAL; if (!info->attrs[HWSIM_ATTR_ADDR_RECEIVER] || !info->attrs[HWSIM_ATTR_FRAME] || @@ -3088,25 +3089,6 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, frame_data_len = nla_len(info->attrs[HWSIM_ATTR_FRAME]); frame_data = (void *)nla_data(info->attrs[HWSIM_ATTR_FRAME]); - /* Allocate new skb here */ - skb = alloc_skb(frame_data_len, GFP_KERNEL); - if (skb == NULL) { - if (hwsim_ratelimit()) - printk(KERN_DEBUG " hwsim rx-nl: skb alloc failed, len: %d\n", - frame_data_len); - goto out; - } - - if (frame_data_len > IEEE80211_MAX_DATA_LEN) { - if (hwsim_ratelimit()) - printk(KERN_DEBUG " hwsim rx-nl: data lenth error: %d max: %d\n", - frame_data_len, IEEE80211_MAX_DATA_LEN); - goto out; - } - - /* Copy the data */ - memcpy(skb_put(skb, frame_data_len), frame_data, frame_data_len); - data2 = get_hwsim_data_ref_from_addr(dst); if (!data2) { @@ -3135,9 +3117,30 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, if (((cnt++ & 0x3FF) == 0x3FF) && hwsim_ratelimit()) printk(KERN_DEBUG " hwsim rx-nl: radio %pM idle: %d or not started: %d cnt: %d\n", dst, data2->idle, !data2->started, cnt); + rv = -ENETDOWN; goto out; } + if (frame_data_len > IEEE80211_MAX_DATA_LEN) { + if (hwsim_ratelimit()) + printk(KERN_DEBUG " hwsim rx-nl: data lenth error: %d max: %d\n", + frame_data_len, IEEE80211_MAX_DATA_LEN); + goto out; + } + + + /* Allocate new skb here */ + skb = alloc_skb(frame_data_len, GFP_KERNEL); + if (skb == NULL) { + if (hwsim_ratelimit()) + printk(KERN_DEBUG " hwsim rx-nl: skb alloc failed, len: %d\n", + frame_data_len); + goto out; + } + + /* Copy the data */ + memcpy(skb_put(skb, frame_data_len), frame_data, frame_data_len); + /* A frame is received from user space */ memset(&rx_status, 0, sizeof(rx_status)); if (info->attrs[HWSIM_ATTR_FREQ]) { -- 2.4.11