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@xxxxxxxxxxxxxxxx/ > > 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
