]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
authorHaimin Zhang <tcs_kernel@tencent.com>
Tue, 8 Mar 2022 03:20:28 +0000 (11:20 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:37:18 +0000 (14:37 +0200)
commitc43de434705197dec5f0e878e2d7be2c92557ee9
tree960d75a0431df840511db242870dd1faeb07acd7
parent394c80154bc4b21500194db483a21440a081781e
af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit 9a564bccb78a76740ea9d75a259942df8143d02c ]

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>
(cherry picked from commit d06ee4572fd916fbb34d16dc81eb37d1dff83446)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
net/key/af_key.c