Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit23224e4

Browse files
ebiggerstorvalds
authored andcommitted
mm: remove kzfree() compatibility definition
Commit453431a ("mm, treewide: rename kzfree() tokfree_sensitive()") renamed kzfree() to kfree_sensitive(),but it left a compatibility definition of kzfree() to avoidbeing too disruptive.Since then a few more instances of kzfree() have slipped in.Just get rid of them and remove the compatibility definitiononce and for all.Signed-off-by: Eric Biggers <ebiggers@google.com>Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent0f7f635 commit23224e4

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

‎drivers/staging/rtl8192e/rtllib_crypt_tkip.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static void rtllib_tkip_deinit(void *priv)
100100
crypto_free_shash(_priv->tx_tfm_michael);
101101
crypto_free_shash(_priv->rx_tfm_michael);
102102
}
103-
kzfree(priv);
103+
kfree_sensitive(priv);
104104
}
105105

106106

‎drivers/staging/rtl8192e/rtllib_crypt_wep.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static void *prism2_wep_init(int keyidx)
4949

5050
staticvoidprism2_wep_deinit(void*priv)
5151
{
52-
kzfree(priv);
52+
kfree_sensitive(priv);
5353
}
5454

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

‎drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static void ieee80211_tkip_deinit(void *priv)
107107
crypto_free_shash(_priv->tx_tfm_michael);
108108
crypto_free_shash(_priv->rx_tfm_michael);
109109
}
110-
kzfree(priv);
110+
kfree_sensitive(priv);
111111
}
112112

113113

‎drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static void *prism2_wep_init(int keyidx)
5454

5555
staticvoidprism2_wep_deinit(void*priv)
5656
{
57-
kzfree(priv);
57+
kfree_sensitive(priv);
5858
}
5959

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

‎include/linux/slab.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,6 @@ void kfree_sensitive(const void *);
187187
size_t__ksize(constvoid*);
188188
size_tksize(constvoid*);
189189

190-
#definekzfree(x)kfree_sensitive(x)/* For backward compatibility */
191-
192190
#ifdefCONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR
193191
void__check_heap_object(constvoid*ptr,unsigned longn,structpage*page,
194192
boolto_user);

‎net/tipc/crypto.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ static void tipc_aead_free(struct rcu_head *rp)
418418
kfree(head);
419419
}
420420
free_percpu(aead->tfm_entry);
421-
kzfree(aead->key);
421+
kfree_sensitive(aead->key);
422422
kfree(aead);
423423
}
424424

@@ -2452,7 +2452,7 @@ static void tipc_crypto_work_tx(struct work_struct *work)
24522452
tipc_crypto_key_init(tx,skey,PER_NODE_KEY, false);
24532453
if (likely(rc>0))
24542454
rc=tipc_crypto_key_distr(tx,rc,NULL);
2455-
kzfree(skey);
2455+
kfree_sensitive(skey);
24562456
}
24572457

24582458
if (unlikely(rc))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp