diff options
| author | Paul Moore | 2006-11-17 23:38:47 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-12-03 06:24:08 +0100 |
| commit | 05e00cbf5036929355020dab4837b637203a0742 (patch) | |
| tree | 642cd1852808fbd89a2c666e39f23b7f48f2c4c0 /net/ipv4/cipso_ipv4.c | |
| parent | NetLabel: make netlbl_lsm_secattr struct easier/quicker to understand (diff) | |
| download | kernel-qcow2-linux-05e00cbf5036929355020dab4837b637203a0742.tar.gz kernel-qcow2-linux-05e00cbf5036929355020dab4837b637203a0742.tar.xz kernel-qcow2-linux-05e00cbf5036929355020dab4837b637203a0742.zip | |
NetLabel: check for a CIPSOv4 option before we do call into the CIPSOv4 layer
Right now the NetLabel code always jumps into the CIPSOv4 layer to determine if
a CIPSO IP option is present. However, we can do this check directly in the
NetLabel code by making use of the CIPSO_V4_OPTEXIST() macro which should save
us a function call in the common case of not having a CIPSOv4 option present.
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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index f0a0785047fe..fb5d913f5815 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -1435,8 +1435,6 @@ int cipso_v4_skbuff_getattr(const struct sk_buff *skb, u32 doi; struct cipso_v4_doi *doi_def; - if (!CIPSO_V4_OPTEXIST(skb)) - return -ENOMSG; cipso_ptr = CIPSO_V4_OPTPTR(skb); if (cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr) == 0) return 0; |