From: Dan Carpenter <dan.carpenter@oracle.com>
To: Johannes Berg <johannes@sipsolutions.net>,
Jouni Malinen <jouni@qca.qualcomm.com>
Cc: linux-wireless@vger.kernel.org,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [patch] mac80111: aes_ccm: cleanup ieee80211_aes_key_setup_encrypt()
Date: Mon, 23 Mar 2015 17:08:14 +0300 [thread overview]
Message-ID: <20150323140814.GA27609@mwanda> (raw)
In-Reply-To: <20150323132409.GA20999@jouni.qca.qualcomm.com>
This code is written using an anti-pattern called "success handling"
which makes it hard to read, especially if you are used to normal kernel
style. It should instead be written as a list of directives in a row
with branches for error handling.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/net/mac80211/aes_ccm.c b/net/mac80211/aes_ccm.c
index 7869bb40..208df7c 100644
--- a/net/mac80211/aes_ccm.c
+++ b/net/mac80211/aes_ccm.c
@@ -85,11 +85,15 @@ struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[],
return tfm;
err = crypto_aead_setkey(tfm, key, key_len);
- if (!err)
- err = crypto_aead_setauthsize(tfm, mic_len);
- if (!err)
- return tfm;
+ if (err)
+ goto free_aead;
+ err = crypto_aead_setauthsize(tfm, mic_len);
+ if (err)
+ goto free_aead;
+
+ return tfm;
+free_aead:
crypto_free_aead(tfm);
return ERR_PTR(err);
}
next prev parent reply other threads:[~2015-03-23 14:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 12:53 mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers Dan Carpenter
2015-03-23 13:24 ` Jouni Malinen
2015-03-23 14:08 ` Dan Carpenter [this message]
2015-03-24 9:32 ` [patch] mac80111: aes_ccm: cleanup ieee80211_aes_key_setup_encrypt() Ard Biesheuvel
2015-03-30 8:40 ` Johannes Berg
2015-03-23 14:40 ` mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150323140814.GA27609@mwanda \
--to=dan.carpenter@oracle.com \
--cc=ard.biesheuvel@linaro.org \
--cc=johannes@sipsolutions.net \
--cc=jouni@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).