diff options
| author | Horia Geanta <horia.geanta@freescale.com> | 2014-04-18 12:01:42 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-04-28 12:17:18 +0200 |
| commit | 27c5fb7a84242b66bf1e0b2fe6bf40d19bcc5c04 (patch) | |
| tree | eece880987ed5b35e9ffbbe089d86671d188701c /drivers/crypto | |
| parent | hwrng: bcm2835 - fix oops when rng h/w is accessed during registration (diff) | |
| download | linux-27c5fb7a84242b66bf1e0b2fe6bf40d19bcc5c04.tar.xz linux-27c5fb7a84242b66bf1e0b2fe6bf40d19bcc5c04.zip | |
crypto: caam - add allocation failure handling in SPRINTFCAT macro
GFP_ATOMIC memory allocation could fail.
In this case, avoid NULL pointer dereference and notify user.
Cc: <stable@vger.kernel.org> # 3.2+
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>
Diffstat (limited to 'drivers/crypto')
| -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) |