Commit 23224e45 authored by Eric Biggers's avatar Eric Biggers Committed by Linus Torvalds
Browse files

mm: remove kzfree() compatibility definition 



Commit 453431a5 ("mm, treewide: rename kzfree() to
kfree_sensitive()") renamed kzfree() to kfree_sensitive(),
but it left a compatibility definition of kzfree() to avoid
being too disruptive.

Since then a few more instances of kzfree() have slipped in.

Just get rid of them and remove the compatibility definition
once and for all.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0f7f635b

drivers/staging/rtl8192e/rtllib_crypt_tkip.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void rtllib_tkip_deinit(void *priv) 
		crypto_free_shash(_priv->tx_tfm_michael);

		crypto_free_shash(_priv->rx_tfm_michael);

	}

	kzfree(priv);

	kfree_sensitive(priv);

}

drivers/staging/rtl8192e/rtllib_crypt_wep.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static void *prism2_wep_init(int keyidx) 


static void prism2_wep_deinit(void *priv)

{

	kzfree(priv);

	kfree_sensitive(priv);

}



/* Perform WEP encryption on given skb that has at least 4 bytes of headroom

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static void ieee80211_tkip_deinit(void *priv) 
		crypto_free_shash(_priv->tx_tfm_michael);

		crypto_free_shash(_priv->rx_tfm_michael);

	}

	kzfree(priv);

	kfree_sensitive(priv);

}

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void *prism2_wep_init(int keyidx) 


static void prism2_wep_deinit(void *priv)

{

	kzfree(priv);

	kfree_sensitive(priv);

}



/* Perform WEP encryption on given skb that has at least 4 bytes of headroom

include/linux/slab.h

+0 −2
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ void kfree_sensitive(const void *); 
size_t __ksize(const void *);

size_t ksize(const void *);



#define kzfree(x)	kfree_sensitive(x)	/* For backward compatibility */



#ifdef CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR

void __check_heap_object(const void *ptr, unsigned long n, struct page *page,

			bool to_user);

CRA Git | Maintained and supported by SUSTech CRA and CCSE