* [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta()
@ 2023-09-27 12:40 Dan Carpenter
2023-10-26 10:42 ` Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2023-09-27 12:40 UTC (permalink / raw)
To: Gregory Greenman
Cc: Kalle Valo, Johannes Berg, Miri Korenblit, Shaul Triebitz,
linux-wireless, kernel-janitors
This error path should return -EINVAL instead of success.
Fixes: 57974a55d995 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
I copy and pasted this approach from similar code in the same patch.
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 1464aad039e1..f2e952481ff8 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -707,8 +707,10 @@ int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
rcu_dereference_protected(mvm_sta->link[link_id],
lockdep_is_held(&mvm->mutex));
- if (WARN_ON(!link_conf || !mvm_link_sta))
+ if (WARN_ON(!link_conf || !mvm_link_sta)) {
+ ret = -EINVAL;
goto err;
+ }
ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf,
mvm_link_sta);
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta()
2023-09-27 12:40 [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta() Dan Carpenter
@ 2023-10-26 10:42 ` Dan Carpenter
2023-10-26 10:44 ` Korenblit, Miriam Rachel
2023-10-26 14:09 ` Greenman, Gregory
0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2023-10-26 10:42 UTC (permalink / raw)
To: Gregory Greenman
Cc: Kalle Valo, Johannes Berg, Miri Korenblit, Shaul Triebitz,
linux-wireless, kernel-janitors
Ping?
regards,
dan carpenter
On Wed, Sep 27, 2023 at 03:40:41PM +0300, Dan Carpenter wrote:
> This error path should return -EINVAL instead of success.
>
> Fixes: 57974a55d995 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> I copy and pasted this approach from similar code in the same patch.
>
> drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> index 1464aad039e1..f2e952481ff8 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> @@ -707,8 +707,10 @@ int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
> rcu_dereference_protected(mvm_sta->link[link_id],
> lockdep_is_held(&mvm->mutex));
>
> - if (WARN_ON(!link_conf || !mvm_link_sta))
> + if (WARN_ON(!link_conf || !mvm_link_sta)) {
> + ret = -EINVAL;
> goto err;
> + }
>
> ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf,
> mvm_link_sta);
> --
> 2.39.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta()
2023-10-26 10:42 ` Dan Carpenter
@ 2023-10-26 10:44 ` Korenblit, Miriam Rachel
2023-10-26 14:09 ` Greenman, Gregory
1 sibling, 0 replies; 4+ messages in thread
From: Korenblit, Miriam Rachel @ 2023-10-26 10:44 UTC (permalink / raw)
To: Dan Carpenter, Greenman, Gregory
Cc: Kalle Valo, Berg, Johannes, Triebitz, Shaul,
linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org
Hi
Sorry for the delay,
I am fixing it.
Thanks,
Miri
Miri Korenblit | CCG | WCS | WCD
Office: +972 2 589-7724 | Cell Phone: +972 54 846 3803
-----Original Message-----
From: Dan Carpenter <dan.carpenter@linaro.org>
Sent: Thursday, October 26, 2023 13:42
To: Greenman, Gregory <gregory.greenman@intel.com>
Cc: Kalle Valo <kvalo@kernel.org>; Berg, Johannes <johannes.berg@intel.com>; Korenblit, Miriam Rachel <miriam.rachel.korenblit@intel.com>; Triebitz, Shaul <shaul.triebitz@intel.com>; linux-wireless@vger.kernel.org; kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta()
Ping?
regards,
dan carpenter
On Wed, Sep 27, 2023 at 03:40:41PM +0300, Dan Carpenter wrote:
> This error path should return -EINVAL instead of success.
>
> Fixes: 57974a55d995 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> I copy and pasted this approach from similar code in the same patch.
>
> drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> index 1464aad039e1..f2e952481ff8 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> @@ -707,8 +707,10 @@ int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
> rcu_dereference_protected(mvm_sta->link[link_id],
> lockdep_is_held(&mvm->mutex));
>
> - if (WARN_ON(!link_conf || !mvm_link_sta))
> + if (WARN_ON(!link_conf || !mvm_link_sta)) {
> + ret = -EINVAL;
> goto err;
> + }
>
> ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf,
> mvm_link_sta);
> --
> 2.39.2
---------------------------------------------------------------------
A member of the Intel Corporation group of companies
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta()
2023-10-26 10:42 ` Dan Carpenter
2023-10-26 10:44 ` Korenblit, Miriam Rachel
@ 2023-10-26 14:09 ` Greenman, Gregory
1 sibling, 0 replies; 4+ messages in thread
From: Greenman, Gregory @ 2023-10-26 14:09 UTC (permalink / raw)
To: dan.carpenter@linaro.org
Cc: kvalo@kernel.org, linux-wireless@vger.kernel.org,
Korenblit, Miriam Rachel, Berg, Johannes, Triebitz, Shaul,
kernel-janitors@vger.kernel.org
On Thu, 2023-10-26 at 13:42 +0300, Dan Carpenter wrote:
> Ping?
>
> regards,
> dan carpenter
>
> On Wed, Sep 27, 2023 at 03:40:41PM +0300, Dan Carpenter wrote:
> > This error path should return -EINVAL instead of success.
> >
> > Fixes: 57974a55d995 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()")
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > ---
> > I copy and pasted this approach from similar code in the same patch.
> >
> > drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> > index 1464aad039e1..f2e952481ff8 100644
> > --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
> > @@ -707,8 +707,10 @@ int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
> > rcu_dereference_protected(mvm_sta->link[link_id],
> > lockdep_is_held(&mvm->mutex));
> >
> > - if (WARN_ON(!link_conf || !mvm_link_sta))
> > + if (WARN_ON(!link_conf || !mvm_link_sta)) {
> > + ret = -EINVAL;
> > goto err;
> > + }
> >
> > ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf,
> > mvm_link_sta);
> > --
> > 2.39.2
Thanks for the fix.
Acked-by: Gregory Greenman <gregory.greenman@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-26 14:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-27 12:40 [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta() Dan Carpenter
2023-10-26 10:42 ` Dan Carpenter
2023-10-26 10:44 ` Korenblit, Miriam Rachel
2023-10-26 14:09 ` Greenman, Gregory
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox