Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [VLAN]: Avoid a 4-order allocation.
  [HDLC] Fix dev->header_cache_update having a random value.
  [NetLabel]: Verify sensitivity level has a valid CIPSO mapping
  [PPPOE]: Key connections properly on local device.
  [AF_UNIX]: Test against sk_max_ack_backlog properly.
  [NET]: Fix bugs in "Whether sock accept queue is full" checking

1 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 60aafb4a8a..c976dd7e97 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -732,11 +732,12 @@ static int cipso_v4_map_lvl_hton(const struct cipso_v4_doi *doi_def,
                 *net_lvl = host_lvl;
                 return 0;
         case CIPSO_V4_MAP_STD:
-                if (host_lvl < doi_def->map.std->lvl.local_size) {
+                if (host_lvl < doi_def->map.std->lvl.local_size &&
+                    doi_def->map.std->lvl.local[host_lvl] < CIPSO_V4_INV_LVL) {
                         *net_lvl = doi_def->map.std->lvl.local[host_lvl];
                         return 0;
                 }
-                break;
+                return -EPERM;
         }
 
         return -EINVAL;
@@ -771,7 +772,7 @@ static int cipso_v4_map_lvl_ntoh(const struct cipso_v4_doi *doi_def,
                         *host_lvl = doi_def->map.std->lvl.cipso[net_lvl];
                         return 0;
                 }
-                break;
+                return -EPERM;
         }
 
         return -EINVAL;