From: Eric Dumazet <edumazet@google.com>
Date: Wed, 16 Feb 2022 17:18:01 +0000 (-0800)
Subject: net: add sanity check in proto_register()
X-Git-Tag: v6.6.17~7931^2~319
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f20cfd662a62dc62c25d9feff29eadc600455ca7;p=platform%2Fkernel%2Flinux-rpi.git

net: add sanity check in proto_register()

prot->memory_allocated should only be set if prot->sysctl_mem
is also set.

This is a followup of commit 25206111512d ("crypto: af_alg - get
rid of alg_memory_allocated").

Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20220216171801.3604366-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index 09d31a7..d76218a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3718,6 +3718,10 @@ int proto_register(struct proto *prot, int alloc_slab)
 {
 	int ret = -ENOBUFS;
 
+	if (prot->memory_allocated && !prot->sysctl_mem) {
+		pr_err("%s: missing sysctl_mem\n", prot->name);
+		return -EINVAL;
+	}
 	if (alloc_slab) {
 		prot->slab = kmem_cache_create_usercopy(prot->name,
 					prot->obj_size, 0,