android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netlabel: fix shift wrapping bug in netlbl_catmap_setlong()

Browse Source 
[ 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>
This commit is contained in:
Dmitry Mastykin 2023-06-08 16:57:54 +03:00 committed by Greg Kroah-Hartman
parent 78ef22febd
commit 179b9b062f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/netlabel/netlabel_kapi.c
View File

@ -857,7 +857,8 @@ int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
offset -= iter->startbit; offset -= iter->startbit;
idx = offset / NETLBL_CATMAP_MAPSIZE; 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; return 0;
} }