Commit 9ff74d77 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Jakub Kicinski
Browse files

netlabel: remove impossible return value in netlbl_bitmap_walk 



Since commit 446fda4f ("[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: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Acked-by: default avatarPaul Moore <paul@paul-moore.com>
Link: https://lore.kernel.org/r/20240227093604.3574241-1-shaozhengchao@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3cbab892

net/ipv4/cipso_ipv4.c

+1 −4
Original line number Diff line number Diff line
@@ -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:

net/ipv6/calipso.c

+1 −4
Original line number Diff line number Diff line
@@ -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,

net/netlabel/netlabel_kapi.c

+1 −1
Original line number Diff line number Diff line
@@ -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)