Commit b403643d authored by Dmitry Mastykin's avatar Dmitry Mastykin Committed by David S. Miller
Browse files

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: default avatarDmitry Mastykin <dmastykin@astralinux.ru>
Acked-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14df9526

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;

}