lkml.org 
[lkml]   [2019]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 15/81] nl80211: Add NL80211_FLAG_CLEAR_SKB flag for other NL commands
    Date
    From: Sunil Dutt <usdutt@codeaurora.org>

    [ Upstream commit d6db02a88a4aaa1cd7105137c67ddec7f3bdbc05 ]

    This commit adds NL80211_FLAG_CLEAR_SKB flag to other NL commands
    that carry key data to ensure they do not stick around on heap
    after the SKB is freed.

    Also introduced this flag for NL80211_CMD_VENDOR as there are sub
    commands which configure the keys.

    Signed-off-by: Sunil Dutt <usdutt@codeaurora.org>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/wireless/nl80211.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
    index 295cd8d5554f..048e004ed0ee 100644
    --- a/net/wireless/nl80211.c
    +++ b/net/wireless/nl80211.c
    @@ -13392,7 +13392,8 @@ static const struct genl_ops nl80211_ops[] = {
    .policy = nl80211_policy,
    .flags = GENL_UNS_ADMIN_PERM,
    .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
    - NL80211_FLAG_NEED_RTNL,
    + NL80211_FLAG_NEED_RTNL |
    + NL80211_FLAG_CLEAR_SKB,
    },
    {
    .cmd = NL80211_CMD_DEAUTHENTICATE,
    @@ -13443,7 +13444,8 @@ static const struct genl_ops nl80211_ops[] = {
    .policy = nl80211_policy,
    .flags = GENL_UNS_ADMIN_PERM,
    .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
    - NL80211_FLAG_NEED_RTNL,
    + NL80211_FLAG_NEED_RTNL |
    + NL80211_FLAG_CLEAR_SKB,
    },
    {
    .cmd = NL80211_CMD_UPDATE_CONNECT_PARAMS,
    @@ -13451,7 +13453,8 @@ static const struct genl_ops nl80211_ops[] = {
    .policy = nl80211_policy,
    .flags = GENL_ADMIN_PERM,
    .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
    - NL80211_FLAG_NEED_RTNL,
    + NL80211_FLAG_NEED_RTNL |
    + NL80211_FLAG_CLEAR_SKB,
    },
    {
    .cmd = NL80211_CMD_DISCONNECT,
    @@ -13480,7 +13483,8 @@ static const struct genl_ops nl80211_ops[] = {
    .policy = nl80211_policy,
    .flags = GENL_UNS_ADMIN_PERM,
    .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
    - NL80211_FLAG_NEED_RTNL,
    + NL80211_FLAG_NEED_RTNL |
    + NL80211_FLAG_CLEAR_SKB,
    },
    {
    .cmd = NL80211_CMD_DEL_PMKSA,
    @@ -13832,7 +13836,8 @@ static const struct genl_ops nl80211_ops[] = {
    .policy = nl80211_policy,
    .flags = GENL_UNS_ADMIN_PERM,
    .internal_flags = NL80211_FLAG_NEED_WIPHY |
    - NL80211_FLAG_NEED_RTNL,
    + NL80211_FLAG_NEED_RTNL |
    + NL80211_FLAG_CLEAR_SKB,
    },
    {
    .cmd = NL80211_CMD_SET_QOS_MAP,
    @@ -13887,7 +13892,8 @@ static const struct genl_ops nl80211_ops[] = {
    .doit = nl80211_set_pmk,
    .policy = nl80211_policy,
    .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
    - NL80211_FLAG_NEED_RTNL,
    + NL80211_FLAG_NEED_RTNL |
    + NL80211_FLAG_CLEAR_SKB,
    },
    {
    .cmd = NL80211_CMD_DEL_PMK,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-05-07 07:36    [W:4.569 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site