On Mon, Mar 28, 2016 at 11:10 AM, Paul Moore <pmoore@xxxxxxxxxx> wrote:
> From: Janak Desai <Janak.Desai@xxxxxxxxxxxxxxx>
>
> We try to be clever and set large chunks of the bitmap at once, when
> possible; unfortunately we weren't very clever when we wrote the code
> and messed up the if-conditional. Fix this bug and restore proper
> operation.
>
> Signed-off-by: Janak Desai <Janak.Desai@xxxxxxxxxxxxxxx>
> Signed-off-by: Paul Moore <paul@xxxxxxxxxxxxxx>
> ---
> net/netlabel/netlabel_kapi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
DaveM, I'm planning on carrying this in selinux#next unless you really
want to this to go to Linus via the netdev tree.
> diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
> index 28cddc8..1325776 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,
>
--
paul moore
www.paul-moore.com
_______________________________________________
Selinux mailing list
Selinux@xxxxxxxxxxxxx
To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx.
To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
