diff options
| author | Paul Moore <paul.moore@hp.com> | 2006-10-11 19:10:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-10-15 23:14:16 -0700 |
| commit | ea614d7f4fb2d436b7a5ee490d1011615f6b38d5 (patch) | |
| tree | 39953be82c3a6fc98cc6257cb965cd1af159fe6f /net/ipv4/cipso_ipv4.c | |
| parent | bf0edf39296097f20c5fcc4919ed7d339194bd75 (diff) | |
| download | op-kernel-dev-ea614d7f4fb2d436b7a5ee490d1011615f6b38d5.zip op-kernel-dev-ea614d7f4fb2d436b7a5ee490d1011615f6b38d5.tar.gz | |
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: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
| -rw-r--r-- | net/ipv4/cipso_ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index d19c9ac..e2077a3 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -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; |
