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

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

NetLabel: the CIPSOv4 passthrough mapping does not pass categories correctly 



The CIPSO passthrough mapping had a problem when sending categories which
would cause no or incorrect categories to be sent on the wire with a packet.
This patch fixes the problem which was a simple off-by-one bug.

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

net/ipv4/cipso_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -832,8 +832,8 @@ static int cipso_v4_map_cat_rbm_hton(const struct cipso_v4_doi *doi_def, 


	switch (doi_def->type) {

	case CIPSO_V4_MAP_PASS:

		net_spot_max = host_cat_len - 1;

		while (net_spot_max > 0 && host_cat[net_spot_max] == 0)

		net_spot_max = host_cat_len;

		while (net_spot_max > 0 && host_cat[net_spot_max - 1] == 0)

			net_spot_max--;

		if (net_spot_max > net_cat_len)

			return -EINVAL;