Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4999f362 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Fix crypto_alloc_comp error checking 



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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fffe470a

net/ipv4/ipcomp.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/module.h>

#include <asm/semaphore.h>

#include <linux/crypto.h>

#include <linux/err.h>

#include <linux/pfkeyv2.h>

#include <linux/percpu.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) {

		struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,

							    CRYPTO_ALG_ASYNC);

		if (!tfm)

		if (IS_ERR(tfm))

			goto error;

		*per_cpu_ptr(tfms, cpu) = tfm;

	}

net/ipv6/ipcomp6.c

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <net/ipcomp.h>

#include <asm/semaphore.h>

#include <linux/crypto.h>

#include <linux/err.h>

#include <linux/pfkeyv2.h>

#include <linux/random.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) {

		struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,

							    CRYPTO_ALG_ASYNC);

		if (!tfm)

		if (IS_ERR(tfm))

			goto error;

		*per_cpu_ptr(tfms, cpu) = tfm;

	}