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

Commit f4ebc993 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] cryptomgr: Fix use after free
parents 0c23664e 1605b847

crypto/cryptomgr.c

+3 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include "internal.h"



struct cryptomgr_param {

	struct task_struct *thread;



	struct rtattr *tb[CRYPTOA_MAX];



	struct {
@@ -81,6 +79,7 @@ err: 


static int cryptomgr_schedule_probe(struct crypto_larval *larval)

{

	struct task_struct *thread;

	struct cryptomgr_param *param;

	const char *name = larval->alg.cra_name;

	const char *p;
@@ -130,8 +129,8 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval) 


	memcpy(param->larval.name, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);



	param->thread = kthread_run(cryptomgr_probe, param, "cryptomgr");

	if (IS_ERR(param->thread))

	thread = kthread_run(cryptomgr_probe, param, "cryptomgr");

	if (IS_ERR(thread))

		goto err_free_param;



	return NOTIFY_STOP;