Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 307c65e2 authored by Sunil Dutt's avatar Sunil Dutt Committed by Greg Kroah-Hartman
Browse files

nl80211: Add NL80211_FLAG_CLEAR_SKB flag for other NL commands 



[ 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: default avatarSunil Dutt <usdutt@codeaurora.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e8eeb5e7

net/wireless/nl80211.c

+12 −6
Original line number Diff line number Diff line
@@ -12761,7 +12761,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,
@@ -12812,7 +12813,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,
@@ -12820,7 +12822,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,
@@ -12849,7 +12852,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,
@@ -13201,7 +13205,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,
@@ -13256,7 +13261,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,