diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-05 19:31:34 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-05 19:31:34 -0400 |
| commit | a6926cc989eb8e3349ae9b858177608e86f7257c (patch) | |
| tree | 201583130b6b5d323ba3c5b3ef44565bf113f5f1 /net/netlabel/netlabel_kapi.c | |
| parent | 0250abcd726b4eba8a6175f09656fe544ed6491a (diff) | |
| parent | c2316dbf124257ae19fd2e29cb5ec51060649d38 (diff) | |
Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'net/netlabel/netlabel_kapi.c')
| -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, | |||
| 677 | u32 spot = start; | 677 | u32 spot = start; |
| 678 | 678 | ||
| 679 | while (rc == 0 && spot <= end) { | 679 | while (rc == 0 && spot <= end) { |
| 680 | if (((spot & (BITS_PER_LONG - 1)) != 0) && | 680 | if (((spot & (BITS_PER_LONG - 1)) == 0) && |
| 681 | ((end - spot) > BITS_PER_LONG)) { | 681 | ((end - spot) > BITS_PER_LONG)) { |
| 682 | rc = netlbl_catmap_setlong(catmap, | 682 | rc = netlbl_catmap_setlong(catmap, |
| 683 | spot, | 683 | spot, |