Commit c1ce2f09 authored Jun 08, 2023 by Dmitry Mastykin Committed by Greg Kroah-Hartman Sep 23, 2023

netlabel: fix shift wrapping bug in netlbl_catmap_setlong()



[ Upstream commit b403643d154d15176b060b82f7fc605210033edd ]

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@astralinux.ru>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 499eb477

net/netlabel/netlabel_kapi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}