net: macsec: fix net device access prior to holding a lock
Subsystems (3)
PATCH 1/1 net: macsec: fix net device access prior to holding a lock
From: Emeel Hakim <[email protected]>
Currently macsec offload selection update routine accesses the net device prior to holding the relevant lock. Fix by holding the lock prior to the device access.
Fixes dcb780fb2795 ("net: macsec: add nla support for changing the offloading selection")
Reviewed-by Raed Salem <[email protected]>
Signed-off-by Emeel Hakim <[email protected]>
--- drivers/net/macsec.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/net/macsec.c +21 -13
@@ -2593,7 +2593,7 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)const struct macsec_ops *ops;struct macsec_context ctx;struct macsec_dev *macsec; -int ret; +int ret =0 ;if (!attrs[MACSEC_ATTR_IFINDEX ])return -EINVAL ;
@@ -2606,28 +2606,36 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info) macsec_genl_offload_policy, NULL))return -EINVAL ; +rtnl_lock (); + dev =get_dev_from_nl (genl_info_net (info), attrs); -if (IS_ERR (dev)) -return PTR_ERR (dev); +if (IS_ERR (dev)) { + ret =PTR_ERR (dev); + goto out; + } macsec =macsec_priv (dev); -if (!tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]) -return -EINVAL ; +if (!tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]) { + ret = -EINVAL ; + goto out; + } offload =nla_get_u8 (tb_offload[MACSEC_OFFLOAD_ATTR_TYPE ]);if (macsec->offload == offload) -return 0 ; + goto out;/* Check if the offloading mode is supported by the underlying layers */ if (offload !=MACSEC_OFFLOAD_OFF && - !macsec_check_offload (offload, macsec)) -return -EOPNOTSUPP ; + !macsec_check_offload (offload, macsec)) { + ret = -EOPNOTSUPP ; + goto out; + }/* Check if the net device is busy. */ -if (netif_running (dev)) -return -EBUSY ; - -rtnl_lock (); +if (netif_running (dev)) { + ret = -EBUSY ; + goto out; + } prev_offload = macsec->offload; macsec->offload = offload;
@@ -2662,7 +2670,7 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info) rollback: macsec->offload = prev_offload; - +out:rtnl_unlock ();return ret; }
Signature · 1 line
2.21.3
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Sun, 11 Dec 2022 09:55:32 +0200 you wrote:
From: Emeel Hakim <[email protected]>
Currently macsec offload selection update routine accesses the net device prior to holding the relevant lock. Fix by holding the lock prior to the device access.
Fixes dcb780fb2795 ("net: macsec: add nla support for changing the offloading selection")Reviewed-by Raed Salem <[email protected]>Signed-off-by Emeel Hakim <[email protected]>[...]
Here is the summary with links:
- [net] net: macsec: fix net device access prior to holding a lock
https://git.kernel.org/netdev/net/c/f3b4a00f0f62
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html