diff options
| author | Paul Moore <paul.moore@hp.com> | 2007-02-28 21:14:21 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2007-04-26 07:35:47 +0200 |
| commit | 128c6b6cbffc8203e13ea5712a8aa65d2ed82e4e (patch) | |
| tree | 1b3717c2d5972a03eeef1f9eb6e9c0de064a1dfb /net | |
| parent | NetLabel: cleanup and document CIPSO constants (diff) | |
| download | linux-128c6b6cbffc8203e13ea5712a8aa65d2ed82e4e.tar.xz linux-128c6b6cbffc8203e13ea5712a8aa65d2ed82e4e.zip | |
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 <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 d466bd5186a1..6afc398c6a22 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); |