diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-06 01:31:34 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-06 01:31:34 +0200 |
| commit | a6926cc989eb8e3349ae9b858177608e86f7257c (patch) | |
| tree | 201583130b6b5d323ba3c5b3ef44565bf113f5f1 /net | |
| parent | Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | selinux: apply execstack check on thread stacks (diff) | |
| download | linux-a6926cc989eb8e3349ae9b858177608e86f7257c.tar.xz linux-a6926cc989eb8e3349ae9b858177608e86f7257c.zip | |
Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'net')
| -rw-r--r-- | net/netlabel/netlabel_kapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index 28cddc85b700..1325776daa27 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c @@ -677,7 +677,7 @@ int netlbl_catmap_setrng(struct netlbl_lsm_catmap **catmap, u32 spot = start; while (rc == 0 && spot <= end) { - if (((spot & (BITS_PER_LONG - 1)) != 0) && + if (((spot & (BITS_PER_LONG - 1)) == 0) && ((end - spot) > BITS_PER_LONG)) { rc = netlbl_catmap_setlong(catmap, spot, |