diff options
| author | Horia Geanta <horia.geanta@freescale.com> | 2014-04-18 13:01:42 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-09 15:53:55 +0200 |
| commit | 2f152373bd3e3fc52dccae4322d2de7fd6467815 (patch) | |
| tree | 5edd8f8a9114c742cd7117fb5fe1e512506f18dd | |
| parent | 7fd5ba24b057b90f61bbf748863b2a0eef438d24 (diff) | |
| download | lwn-2f152373bd3e3fc52dccae4322d2de7fd6467815.tar.gz lwn-2f152373bd3e3fc52dccae4322d2de7fd6467815.zip | |
crypto: caam - add allocation failure handling in SPRINTFCAT macro
commit 27c5fb7a84242b66bf1e0b2fe6bf40d19bcc5c04 upstream.
GFP_ATOMIC memory allocation could fail.
In this case, avoid NULL pointer dereference and notify user.
Cc: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/crypto/caam/error.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c index 9f25f5296029..0eabd81e1a90 100644 --- a/drivers/crypto/caam/error.c +++ b/drivers/crypto/caam/error.c @@ -16,9 +16,13 @@ char *tmp; \ \ tmp = kmalloc(sizeof(format) + max_alloc, GFP_ATOMIC); \ - sprintf(tmp, format, param); \ - strcat(str, tmp); \ - kfree(tmp); \ + if (likely(tmp)) { \ + sprintf(tmp, format, param); \ + strcat(str, tmp); \ + kfree(tmp); \ + } else { \ + strcat(str, "kmalloc failure in SPRINTFCAT"); \ + } \ } static void report_jump_idx(u32 status, char *outstr) |