[PATCH] mac80211: remove mic_fail_no_key label

[PATCH] mac80211: remove mic_fail_no_key label

[Stanislaw Gruszka]

For historic reasons we have separate cases for mic_fail and
mic_fail_no_key. But with current code we can merge those cases,
as we already have NULL key check since:

commit a66b98db570a638afd909459e1e6bfa272344bd3
Author: Arik Nemtsov <arik@wizery.com>
Date:   Thu Jun 23 00:00:24 2011 +0300

    mac80211: fix rx->key NULL dereference during mic failure

Patch makes the rx->key->u.tkip.mic_failures statistics
increase on all cases when RX_FLAG_MMIC_ERROR is set.

Reported-by: Michael Skeffington <mike@astro.ai>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 net/mac80211/wpa.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 0d722ea..98fd9a0 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -111,7 +111,7 @@
 	 */
 	if (status->flag & (RX_FLAG_MMIC_STRIPPED | RX_FLAG_IV_STRIPPED)) {
 		if (status->flag & RX_FLAG_MMIC_ERROR)
-			goto mic_fail_no_key;
+			goto mic_fail;
 
 		if (!(status->flag & RX_FLAG_IV_STRIPPED) && rx->key &&
 		    rx->key->conf.cipher == WLAN_CIPHER_SUITE_TKIP)
@@ -170,7 +170,6 @@
 mic_fail:
 	rx->key->u.tkip.mic_failures++;
 
-mic_fail_no_key:
 	/*
 	 * In some cases the key can be unset - e.g. a multicast packet, in
 	 * a driver that supports HW encryption. Send up the key idx only if
-- 
1.7.1

Re: [PATCH] mac80211: remove mic_fail_no_key label

[Arend van Spriel]

On 8/2/2017 11:04 AM, Stanislaw Gruszka wrote:
> For historic reasons we have separate cases for mic_fail and
> mic_fail_no_key. But with current code we can merge those cases,
> as we already have NULL key check since:
>
> commit a66b98db570a638afd909459e1e6bfa272344bd3
> Author: Arik Nemtsov <arik@wizery.com>
> Date:   Thu Jun 23 00:00:24 2011 +0300
>
>      mac80211: fix rx->key NULL dereference during mic failure

Maybe better to use:
... since commit a66b98db570a ("mac80211: fix rx->key NULL dereference 
during mic failure").

as it is the preferred method to reference git commits.

Regards,
Arend

Re: [PATCH] mac80211: remove mic_fail_no_key label

[Stanislaw Gruszka]

On Wed, Aug 02, 2017 at 11:10:11AM +0200, Arend van Spriel wrote:
> On 8/2/2017 11:04 AM, Stanislaw Gruszka wrote:
> >For historic reasons we have separate cases for mic_fail and
> >mic_fail_no_key. But with current code we can merge those cases,
> >as we already have NULL key check since:
> >
> >commit a66b98db570a638afd909459e1e6bfa272344bd3
> >Author: Arik Nemtsov <arik@wizery.com>
> >Date:   Thu Jun 23 00:00:24 2011 +0300
> >
> >     mac80211: fix rx->key NULL dereference during mic failure
> 
> Maybe better to use:
> ... since commit a66b98db570a ("mac80211: fix rx->key NULL
> dereference during mic failure").
> 
> as it is the preferred method to reference git commits.

Is easier for me to just copy-paste commit in form the git log/show
command provides, so I use that form. Is there tool or git log/show
option to get commit log in the preferred form, so I do not have to
change it manually?

Thanks
Stanislaw

Re: [PATCH] mac80211: remove mic_fail_no_key label

[Kalle Valo]

Stanislaw Gruszka <sgruszka@redhat.com> writes:

> On Wed, Aug 02, 2017 at 11:10:11AM +0200, Arend van Spriel wrote:
>> On 8/2/2017 11:04 AM, Stanislaw Gruszka wrote:
>> >For historic reasons we have separate cases for mic_fail and
>> >mic_fail_no_key. But with current code we can merge those cases,
>> >as we already have NULL key check since:
>> >
>> >commit a66b98db570a638afd909459e1e6bfa272344bd3
>> >Author: Arik Nemtsov <arik@wizery.com>
>> >Date:   Thu Jun 23 00:00:24 2011 +0300
>> >
>> >     mac80211: fix rx->key NULL dereference during mic failure
>> 
>> Maybe better to use:
>> ... since commit a66b98db570a ("mac80211: fix rx->key NULL
>> dereference during mic failure").
>> 
>> as it is the preferred method to reference git commits.
>
> Is easier for me to just copy-paste commit in form the git log/show
> command provides, so I use that form. Is there tool or git log/show
> option to get commit log in the preferred form, so I do not have to
> change it manually?

I do it like this:

$ git show --format=fixes a66b98db570a638afd909459e1e6bfa272344bd3 | head -1
Fixes: a66b98db570a ("mac80211: fix rx->key NULL dereference during mic failure")

How to configure it is documented in SubmittingPatches:

https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes

-- 
Kalle Valo