Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=128c6b6cbffc8203e13ea5712a8aa65d2ed82e4e
Commit:     128c6b6cbffc8203e13ea5712a8aa65d2ed82e4e
Parent:     f998e8cb52396c6a197d14f6afb07144324aea6d
Author:     Paul Moore <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 28 15:14:21 2007 -0500
Committer:  James Morris <[EMAIL PROTECTED]>
CommitDate: Thu Apr 26 01:35:47 2007 -0400

    NetLabel: convert a BUG_ON in the CIPSO code to a runtime check
    
    This patch changes a BUG_ON in the CIPSO code to a runtime check.  It should
    also increase the readability of the code as it replaces an unexplained
    constant with a well defined macro.
    
    Signed-off-by: Paul Moore <[EMAIL PROTECTED]>
    Signed-off-by: James Morris <[EMAIL PROTECTED]>
---
 net/ipv4/cipso_ipv4.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index d466bd5..6afc398 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -1142,7 +1142,9 @@ static int cipso_v4_map_cat_rng_hton(const struct 
cipso_v4_doi *doi_def,
        u32 cat_size = 0;
 
        /* make sure we don't overflow the 'array[]' variable */
-       BUG_ON(net_cat_len > 30);
+       if (net_cat_len >
+           (CIPSO_V4_OPT_LEN_MAX - CIPSO_V4_HDR_LEN - CIPSO_V4_TAG_RNG_BLEN))
+               return -ENOSPC;
 
        for (;;) {
                iter = netlbl_secattr_catmap_walk(secattr->mls_cat, iter + 1);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to