[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230608135754.25044-1-dmastykin@astralinux.ru>
Date: Thu, 8 Jun 2023 16:57:54 +0300
From: Dmitry Mastykin <dmastykin@...ralinux.ru>
To: paul@...l-moore.com,
netdev@...r.kernel.org,
linux-security-module@...r.kernel.org
Cc: Dmitry Mastykin <dmastykin@...ralinux.ru>
Subject: [PATCH] netlabel: fix shift wrapping bug in netlbl_catmap_setlong()
There is a shift wrapping bug in this code on 32-bit architectures.
NETLBL_CATMAP_MAPTYPE is u64, bitmap is unsigned long.
Every second 32-bit word of catmap becomes corrupted.
Signed-off-by: Dmitry Mastykin <dmastykin@...ralinux.ru>
---
net/netlabel/netlabel_kapi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 54c083003947..27511c90a26f 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -857,7 +857,8 @@ int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
offset -= iter->startbit;
idx = offset / NETLBL_CATMAP_MAPSIZE;
- iter->bitmap[idx] |= bitmap << (offset % NETLBL_CATMAP_MAPSIZE);
+ iter->bitmap[idx] |= (NETLBL_CATMAP_MAPTYPE)bitmap
+ << (offset % NETLBL_CATMAP_MAPSIZE);
return 0;
}
--
2.30.2
Powered by blists - more mailing lists