Skip to content

Commit

Permalink
netlabel: remove impossible return value in netlbl_bitmap_walk
Browse files Browse the repository at this point in the history
Since commit 446fda4 ("[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>
  • Loading branch information
Zhengchao Shao authored and Jakub Kicinski committed Feb 29, 2024
1 parent 3cbab89 commit 9ff74d7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
5 changes: 1 addition & 4 deletions net/ipv4/cipso_ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -864,11 +864,8 @@ static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def,
net_clen_bits,
net_spot + 1,
1);
if (net_spot < 0) {
if (net_spot == -2)
return -EFAULT;
if (net_spot < 0)
return 0;
}

switch (doi_def->type) {
case CIPSO_V4_MAP_PASS:
Expand Down
5 changes: 1 addition & 4 deletions net/ipv6/calipso.c
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,8 @@ static int calipso_map_cat_ntoh(const struct calipso_doi *doi_def,
net_clen_bits,
spot + 1,
1);
if (spot < 0) {
if (spot == -2)
return -EFAULT;
if (spot < 0)
return 0;
}

ret_val = netlbl_catmap_setbit(&secattr->attr.mls.cat,
spot,
Expand Down
2 changes: 1 addition & 1 deletion net/netlabel/netlabel_kapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
* Description:
* 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
* not found, or -2 if error.
* not found.
*/
int netlbl_bitmap_walk(const unsigned char *bitmap, u32 bitmap_len,
u32 offset, u8 state)
Expand Down

0 comments on commit 9ff74d7

Please sign in to comment.