diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-10-28 12:25:53 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-10-28 12:59:12 +0200 |
| commit | 514877182b537372352c14a0a50822572f66e831 (patch) | |
| tree | 72b8486ab387ceabb1e4661d97c27edab98804d1 | |
| parent | 088e8df82f91a24728d49d9532cab7ebdee5117f (diff) | |
mac80211: fils_aead: fix encrypt error handling
gcc -Wmaybe-uninitialized reports a bug in aes_siv_encryp:
net/mac80211/fils_aead.c: In function ‘aes_siv_encrypt.constprop’:
net/mac80211/fils_aead.c:84:26: error: ‘tfm2’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
At the time that the memory allocation fails, 'tfm2' has not been
allocated, so we should not attempt to free it later, and we can
simply return an error.
Fixes: 39404feee691 ("mac80211: FILS AEAD protection for station mode association frames")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/fils_aead.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/fils_aead.c b/net/mac80211/fils_aead.c index b81b4f2472cf..ecfdd97758a3 100644 --- a/net/mac80211/fils_aead.c +++ b/net/mac80211/fils_aead.c @@ -110,10 +110,8 @@ static int aes_siv_encrypt(const u8 *key, size_t key_len, * overwriting this during AES-CTR. */ tmp = kmemdup(plain, plain_len, GFP_KERNEL); - if (!tmp) { - res = -ENOMEM; - goto fail; - } + if (!tmp) + return -ENOMEM; /* IV for CTR before encrypted data */ memcpy(out, v, AES_BLOCK_SIZE); |