android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "crypto: api - Use work queue in crypto_destroy_instance"

Browse Source 
This reverts commit 625bf86bf5 which is
commit 9ae4577bc077a7e32c3c7d442c95bc76865c0f17 upstream.

It breaks the android KABI so revert it.  If it needs to come back in
the future, it can be modified to do so in an abi-safe way.

Bug: 161946584
Change-Id: I99e23f307011ff3a7e4b0dfbd6f341512caa3a3d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-09-30 12:24:12 +00:00
parent 92ecfcb0af
commit 2b40885cdc
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crypto/algapi.c
View File

@ -16,7 +16,6 @@
#include <linux/rtnetlink.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/workqueue.h>
#include "internal.h"
@ -69,26 +68,15 @@ static void crypto_free_instance(struct crypto_instance *inst)
inst->alg.cra_type->free(inst);
}
static void crypto_destroy_instance_workfn(struct work_struct *w)
static void crypto_destroy_instance(struct crypto_alg *alg)
{
struct crypto_instance *inst = container_of(w, struct crypto_instance,
free_work);
struct crypto_instance *inst = (void *)alg;
struct crypto_template *tmpl = inst->tmpl;
crypto_free_instance(inst);
crypto_tmpl_put(tmpl);
}
static void crypto_destroy_instance(struct crypto_alg *alg)
{
struct crypto_instance *inst = container_of(alg,
struct crypto_instance,
alg);
INIT_WORK(&inst->free_work, crypto_destroy_instance_workfn);
schedule_work(&inst->free_work);
}
/*
* This function adds a spawn to the list secondary_spawns which
* will be used at the end of crypto_remove_spawns to unregister

3
include/crypto/algapi.h
View File

@ -10,7 +10,6 @@
#include <linux/crypto.h>
#include <linux/list.h>
#include <linux/kernel.h>
#include <linux/workqueue.h>
/*
* Maximum values for blocksize and alignmask, used to allocate
@ -56,8 +55,6 @@ struct crypto_instance {
struct crypto_spawn *spawns;
};
struct work_struct free_work;
void *__ctx[] CRYPTO_MINALIGN_ATTR;
};