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 for Android: free password hash cracker in your pocket

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

Date:   Sat, 29 Oct 2022 22:54:39 +0200
From:   Johannes Berg <johannes@...solutions.net>
To:     Jakub Kicinski <kuba@...nel.org>, 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, 2022-10-28 at 18:34 -0700, Jakub Kicinski wrote:
> > 
> > --- 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
> 

Hah. Me too, when I tried this to see what the resolution should be. Git
versions or something?

johannes