mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
[ Upstream commit 9a564bccb7
]
Add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
to initialize the buffer of supp_skb to fix a kernel-info-leak issue.
1) Function pfkey_register calls compose_sadb_supported to request
a sk_buff. 2) compose_sadb_supported calls alloc_sbk to allocate
a sk_buff, but it doesn't zero it. 3) If auth_len is greater 0, then
compose_sadb_supported treats the memory as a struct sadb_supported and
begins to initialize. But it just initializes the field sadb_supported_len
and field sadb_supported_exttype without field sadb_supported_reserved.
Reported-by: TCS Robot <tcs_robot@tencent.com>
Signed-off-by: Haimin Zhang <tcs_kernel@tencent.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ef1a6ab36d
commit
8d3f4ad430
1 changed files with 1 additions and 1 deletions
|
@ -1703,7 +1703,7 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, const struct sad
|
||||||
|
|
||||||
xfrm_probe_algs();
|
xfrm_probe_algs();
|
||||||
|
|
||||||
supp_skb = compose_sadb_supported(hdr, GFP_KERNEL);
|
supp_skb = compose_sadb_supported(hdr, GFP_KERNEL | __GFP_ZERO);
|
||||||
if (!supp_skb) {
|
if (!supp_skb) {
|
||||||
if (hdr->sadb_msg_satype != SADB_SATYPE_UNSPEC)
|
if (hdr->sadb_msg_satype != SADB_SATYPE_UNSPEC)
|
||||||
pfk->registered &= ~(1<<hdr->sadb_msg_satype);
|
pfk->registered &= ~(1<<hdr->sadb_msg_satype);
|
||||||
|
|
Loading…
Reference in a new issue