diff options
author | Paul Moore <paul.moore@hp.com> | 2008-10-10 10:16:31 -0400 |
---|---|---|
committer | Paul Moore <paul.moore@hp.com> | 2008-10-10 10:16:31 -0400 |
commit | dfaebe9825ff34983778f287101bc5f3bce00640 (patch) | |
tree | 4dccdcdcecd57fc8bfc083ff30d9e0ecb2e7ecba /net | |
parent | 99d854d231ce141850b988bdc7e2e7c78f49b03a (diff) |
selinux: Fix missing calls to netlbl_skbuff_err()
At some point I think I messed up and dropped the calls to netlbl_skbuff_err()
which are necessary for CIPSO to send error notifications to remote systems.
This patch re-introduces the error handling calls into the SELinux code.
Signed-off-by: Paul Moore <paul.moore@hp.com>
Acked-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/netlabel/netlabel_kapi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index 6c211fe97782..22faba620e4b 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c | |||
@@ -490,6 +490,7 @@ int netlbl_skbuff_getattr(const struct sk_buff *skb, | |||
490 | * netlbl_skbuff_err - Handle a LSM error on a sk_buff | 490 | * netlbl_skbuff_err - Handle a LSM error on a sk_buff |
491 | * @skb: the packet | 491 | * @skb: the packet |
492 | * @error: the error code | 492 | * @error: the error code |
493 | * @gateway: true if host is acting as a gateway, false otherwise | ||
493 | * | 494 | * |
494 | * Description: | 495 | * Description: |
495 | * Deal with a LSM problem when handling the packet in @skb, typically this is | 496 | * Deal with a LSM problem when handling the packet in @skb, typically this is |
@@ -497,10 +498,10 @@ int netlbl_skbuff_getattr(const struct sk_buff *skb, | |||
497 | * according to the packet's labeling protocol. | 498 | * according to the packet's labeling protocol. |
498 | * | 499 | * |
499 | */ | 500 | */ |
500 | void netlbl_skbuff_err(struct sk_buff *skb, int error) | 501 | void netlbl_skbuff_err(struct sk_buff *skb, int error, int gateway) |
501 | { | 502 | { |
502 | if (CIPSO_V4_OPTEXIST(skb)) | 503 | if (CIPSO_V4_OPTEXIST(skb)) |
503 | cipso_v4_error(skb, error, 0); | 504 | cipso_v4_error(skb, error, gateway); |
504 | } | 505 | } |
505 | 506 | ||
506 | /** | 507 | /** |