Skip to content

Commit 734bbc1

Browse files
keestehcaster
authored andcommitted
ipc, msg: Use dedicated slab buckets for alloc_msg()
The msg subsystem is a common target for exploiting[1][2][3][4][5][6][7] use-after-free type confusion flaws in the kernel for both read and write primitives. Avoid having a user-controlled dynamically-size allocation share the global kmalloc cache by using a separate set of kmalloc buckets via the kmem_buckets API. Link: https://blog.hacktivesecurity.com/index.php/2022/06/13/linux-kernel-exploit-development-1day-case-study/ [1] Link: https://hardenedvault.net/blog/2022-11-13-msg_msg-recon-mitigation-ved/ [2] Link: https://www.willsroot.io/2021/08/corctf-2021-fire-of-salvation-writeup.html [3] Link: https://a13xp0p0v.github.io/2021/02/09/CVE-2021-26708.html [4] Link: https://google.github.io/security-research/pocs/linux/cve-2021-22555/writeup.html [5] Link: https://zplin.me/papers/ELOISE.pdf [6] Link: https://syst3mfailure.io/wall-of-perdition/ [7] Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]>
1 parent b32801d commit 734bbc1

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

ipc/msgutil.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,17 @@ struct msg_msgseg {
4242
#define DATALEN_MSG ((size_t)PAGE_SIZE-sizeof(struct msg_msg))
4343
#define DATALEN_SEG ((size_t)PAGE_SIZE-sizeof(struct msg_msgseg))
4444

45+
static kmem_buckets *msg_buckets __ro_after_init;
46+
47+
static int __init init_msg_buckets(void)
48+
{
49+
msg_buckets = kmem_buckets_create("msg_msg", SLAB_ACCOUNT,
50+
sizeof(struct msg_msg),
51+
DATALEN_MSG, NULL);
52+
53+
return 0;
54+
}
55+
subsys_initcall(init_msg_buckets);
4556

4657
static struct msg_msg *alloc_msg(size_t len)
4758
{
@@ -50,7 +61,7 @@ static struct msg_msg *alloc_msg(size_t len)
5061
size_t alen;
5162

5263
alen = min(len, DATALEN_MSG);
53-
msg = kmalloc(sizeof(*msg) + alen, GFP_KERNEL_ACCOUNT);
64+
msg = kmem_buckets_alloc(msg_buckets, sizeof(*msg) + alen, GFP_KERNEL);
5465
if (msg == NULL)
5566
return NULL;
5667

0 commit comments

Comments
 (0)