a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IPSEC]: Fix crypto_alloc_comp error checking

Browse Source 
The function crypto_alloc_comp returns an errno instead of NULL
to indicate error.  So it needs to be tested with IS_ERR.

This is based on a patch by Vicen Beltran Querol.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2007-11-07 02:21:47 -08:00 committed by David S. Miller
parent fffe470a80
commit 4999f3621f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/ipcomp.c
View File

@ -16,6 +16,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/err.h>
#include <linux/pfkeyv2.h> #include <linux/pfkeyv2.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
@ -344,7 +345,7 @@ static struct crypto_comp **ipcomp_alloc_tfms(const char *alg_name)
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0, struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,
CRYPTO_ALG_ASYNC); CRYPTO_ALG_ASYNC);
if (!tfm) if (IS_ERR(tfm))
goto error; goto error;
*per_cpu_ptr(tfms, cpu) = tfm; *per_cpu_ptr(tfms, cpu) = tfm;
} }

3
net/ipv6/ipcomp6.c
View File

@ -36,6 +36,7 @@
#include <net/ipcomp.h> #include <net/ipcomp.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/err.h>
#include <linux/pfkeyv2.h> #include <linux/pfkeyv2.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/percpu.h> #include <linux/percpu.h>
@ -358,7 +359,7 @@ static struct crypto_comp **ipcomp6_alloc_tfms(const char *alg_name)
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0, struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,
CRYPTO_ALG_ASYNC); CRYPTO_ALG_ASYNC);
if (!tfm) if (IS_ERR(tfm))
goto error; goto error;
*per_cpu_ptr(tfms, cpu) = tfm; *per_cpu_ptr(tfms, cpu) = tfm;
} }