mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

netlabel: remove impossible return value in netlbl_bitmap_walk 

Since commit 446fda4f26 ("[NetLabel]: CIPSOv4 engine"), *bitmap_walk
function only returns -1. Nearly 18 years have passed, -2 scenes never
come up, so there's no need to consider it.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Link: https://lore.kernel.org/r/20240227093604.3574241-1-shaozhengchao@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Zhengchao Shao 2024-02-27 17:36:04 +08:00 committed by Jakub Kicinski
parent 3cbab89268
commit 9ff74d7718
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/cipso_ipv4.c
View File

@ -864,11 +864,8 @@ static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def,
net_clen_bits, net_clen_bits,
net_spot + 1, net_spot + 1,
1); 1);
if (net_spot < 0) { if (net_spot < 0)
if (net_spot == -2)
return -EFAULT;
return 0; return 0;
}
switch (doi_def->type) { switch (doi_def->type) {
case CIPSO_V4_MAP_PASS: case CIPSO_V4_MAP_PASS:

5
net/ipv6/calipso.c
View File

@ -657,11 +657,8 @@ static int calipso_map_cat_ntoh(const struct calipso_doi *doi_def,
net_clen_bits, net_clen_bits,
spot + 1, spot + 1,
1); 1);
if (spot < 0) { if (spot < 0)
if (spot == -2)
return -EFAULT;
return 0; return 0;
}
ret_val = netlbl_catmap_setbit(&secattr->attr.mls.cat, ret_val = netlbl_catmap_setbit(&secattr->attr.mls.cat,
spot, spot,

2
net/netlabel/netlabel_kapi.c
View File

@ -876,7 +876,7 @@ int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
* Description: * Description:
* Starting at @offset, walk the bitmap from left to right until either the * Starting at @offset, walk the bitmap from left to right until either the
* desired bit is found or we reach the end. Return the bit offset, -1 if * desired bit is found or we reach the end. Return the bit offset, -1 if
* not found, or -2 if error. * not found.
*/ */
int netlbl_bitmap_walk(const unsigned char *bitmap, u32 bitmap_len, int netlbl_bitmap_walk(const unsigned char *bitmap, u32 bitmap_len,
u32 offset, u8 state) u32 offset, u8 state)