Revert "wifi: mac80211_hwsim: check the return value of nla_put_u32"
authorJohannes Berg <johannes.berg@intel.com>
Tue, 22 Aug 2023 12:17:21 +0000 (14:17 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 22 Aug 2023 19:40:41 +0000 (21:40 +0200)
This reverts commit b970ac68e0c4 ("wifi: mac80211_hwsim: check the
return value of nla_put_u32") since it introduced a memory leak in
the error path, which seems worse than sending an incomplete skb,
and the put can't fail anyway since the SKB was just allocated.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/virtual/mac80211_hwsim.c

index ec78fe1..1f52403 100644 (file)
@@ -582,9 +582,8 @@ static int mac80211_hwsim_vendor_cmd_test(struct wiphy *wiphy,
                 */
 
                /* Add vendor data */
-               err = nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TEST, val + 1);
-               if (err)
-                       return err;
+               nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TEST, val + 1);
+
                /* Send the event - this will call nla_nest_end() */
                cfg80211_vendor_event(skb, GFP_KERNEL);
        }