diff options
| author | Paul Moore <paul.moore@hp.com> | 2008-10-10 10:16:34 -0400 |
|---|---|---|
| committer | Paul Moore <paul.moore@hp.com> | 2008-10-10 10:16:34 -0400 |
| commit | 15c45f7b2e81655f6eb500ec949c8bd70a04325a (patch) | |
| tree | 46037ccd3f3c83cb140abdf5d10af73888bdd362 /net/ipv4/ip_options.c | |
| parent | 8d75899d033617316e06296b7c0729612f56aba0 (diff) | |
| download | lwn-15c45f7b2e81655f6eb500ec949c8bd70a04325a.tar.gz lwn-15c45f7b2e81655f6eb500ec949c8bd70a04325a.zip | |
cipso: Add support for native local labeling and fixup mapping names
This patch accomplishes three minor tasks: add a new tag type for local
labeling, rename the CIPSO_V4_MAP_STD define to CIPSO_V4_MAP_TRANS and
replace some of the CIPSO "magic numbers" with constants from the header
file. The first change allows CIPSO to support full LSM labels/contexts,
not just MLS attributes. The second change brings the mapping names inline
with what userspace is using, compatibility is preserved since we don't
actually change the value. The last change is to aid readability and help
prevent mistakes.
Signed-off-by: Paul Moore <paul.moore@hp.com>
Diffstat (limited to 'net/ipv4/ip_options.c')
| -rw-r--r-- | net/ipv4/ip_options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index be3f18a7a40e..2c88da6e7862 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -438,7 +438,7 @@ int ip_options_compile(struct net *net, goto error; } opt->cipso = optptr - iph; - if (cipso_v4_validate(&optptr)) { + if (cipso_v4_validate(skb, &optptr)) { pp_ptr = optptr; goto error; } |