On Mon, 2016-10-17 at 15:05 +0100, Ard Biesheuvel wrote: > From: Johannes Berg <johannes.berg@xxxxxxxxx> That really ought to have been you - I think I may have lost that by accident. I'll change it. > In addition, take care not to put any of our own stack allocations > into > scatterlists. This involves reserving some extra room when allocating > the > aead_request structures, and referring to those allocations in the > scatter- > lists (while copying the data from/to the stack before/after the > crypto > operation, as appropriate) I removed the "to the stack after" language, since that doesn't actually occur :) > --- a/net/mac80211/aes_cmac.h > +++ b/net/mac80211/aes_cmac.h > @@ -11,6 +11,8 @@ > > #include <linux/crypto.h> > > +#define CMAC_AAD_LEN 20 This part (and aes_cmac.c changes) shouldn't have been there, but that was my mistake - removed. With that, I've applied this. Will send it to davem tomorrow. johannes
