Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fade4bf authored by Paul Moore's avatar Paul Moore Committed by David S. Miller
Browse files

NetLabel: return the correct error for translated CIPSOv4 tags 



The CIPSOv4 translated tag #1 mapping does not always return the correct error
code if the desired mapping does not exist; instead of returning -EPERM it
returns -ENOSPC indicating that the buffer is not large enough to hold the
translated value.  This was caused by failing to check a specific error
condition.  This patch fixes this so that unknown mappings return
-EPERM which is consistent with the rest of the related CIPSOv4 code.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 91b1ed0a

net/ipv4/cipso_ipv4.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -867,6 +867,8 @@ static int cipso_v4_map_cat_rbm_hton(const struct cipso_v4_doi *doi_def, 
				return -EPERM;

				return -EPERM;





			net_spot = host_cat_array[host_spot];

			net_spot = host_cat_array[host_spot];

			if (net_spot >= CIPSO_V4_INV_CAT)

				return -EPERM;

			if (net_spot >= net_clen_bits)

			if (net_spot >= net_clen_bits)

				return -ENOSPC;

				return -ENOSPC;

			cipso_v4_bitmap_setbit(net_cat, net_spot, 1);

			cipso_v4_bitmap_setbit(net_cat, net_spot, 1);
@@ -935,6 +937,8 @@ static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def, 
				return -EPERM;

				return -EPERM;





			host_spot = net_cat_array[net_spot];

			host_spot = net_cat_array[net_spot];

			if (host_spot >= CIPSO_V4_INV_CAT)

				return -EPERM;

			if (host_spot >= host_clen_bits)

			if (host_spot >= host_clen_bits)

				return -ENOSPC;

				return -ENOSPC;

			cipso_v4_bitmap_setbit(host_cat, host_spot, 1);

			cipso_v4_bitmap_setbit(host_cat, host_spot, 1);