netdev - Re: pull-request: wireless-next-2022-10-28

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 28 Oct 2022 18:34:45 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     Kalle Valo <kvalo@...nel.org>
Cc:     netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: wireless-next-2022-10-28

On Fri, 28 Oct 2022 13:29:43 +0000 (UTC) Kalle Valo wrote:
> Note: wireless tree was merged[1] to wireless-next to avoid some
> conflicts with mac80211 patches between the trees. Unfortunately there
> are still two smaller conflicts in net/mac80211/util.c which Stephen
> also reported[2]. In the first conflict initialise scratch_len to
> "params->scratch_len ?: 3 * params->len" (note number 3, not 2!) and
> in the second conflict take the version which uses elems->scratch_pos.
> 
> Git diff output should like this:
> 
> --- a/net/mac80211/util.c
> +++ b/net/mac80211/util.c
> @@@ -1506,7 -1648,7 +1650,7 @@@ ieee802_11_parse_elems_full(struct ieee
>         const struct element *non_inherit = NULL;
>         u8 *nontransmitted_profile;
>         int nontransmitted_profile_len = 0;
> -       size_t scratch_len = params->len;
>  -      size_t scratch_len = params->scratch_len ?: 2 * params->len;
> ++      size_t scratch_len = params->scratch_len ?: 3 * params->len;
> 
>         elems = kzalloc(sizeof(*elems) + scratch_len, GFP_ATOMIC);
>         if (!elems)
> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git/commit/?id=dfd2d876b3fda1790bc0239ba4c6967e25d16e91
> [2] https://lore.kernel.org/all/20221020032340.5cf101c0@canb.auug.org.au/

Thanks! I only saw one conflict FWIW