From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16625C67863 for ; Mon, 22 Oct 2018 07:57:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D182820658 for ; Mon, 22 Oct 2018 07:57:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D182820658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=selinux-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727587AbeJVQPD (ORCPT ); Mon, 22 Oct 2018 12:15:03 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:34917 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727579AbeJVQPC (ORCPT ); Mon, 22 Oct 2018 12:15:02 -0400 Received: by mail-oi1-f194.google.com with SMTP id 22-v6so31473507oiz.2 for ; Mon, 22 Oct 2018 00:57:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=f6lpRH4UTBWk0anmTABppRmH5uw6QKDl6Qq0QsPHN4s=; b=RunDzZ7fhD947XP9E5VfEXKZxy4bZpNnBkhj55BcdK3zWEEU4VrdpoNvigS+7RU9gE WtBSM5wnZa2ZdH4mmzYwU3DmSqIudBYEn0JLxDdmy+VScEWlo+jSv/M4z3in/icf0xAx 5AJpo7IggFSU7w8v3QMxpSYbsxhA4hihSD/2FwKVdGk8eYscqg5CQeMNKlD4q0XIYh8q JU3hGNNanFPeM4fM0Oz4Na93n6jvyy2chmMRzdpMv52OOazXhC1/wTAY5m7kmF22x7Td KkS1o6MD7hE5uXQRn+0pOtMnuSL588aUMBdJH4loMu4F0FBexw2SsPwdlnjKbz6dsn/N nKXg== X-Gm-Message-State: ABuFfojP0iAqknAGwL3c7sL0QYjpSIkpe9pqJhQy1dRnTt+aRHL9pSOk +Z7kXOUMQ3yvHb8S+nfhlbzc5YgUFWbJmjtwHrBoYw== X-Google-Smtp-Source: ACcGV63PPTSUL6dAbzk/7chlSZmX19dF2T/ExzbN3BQrq+rMdZfxU1VIv5m+sUDdQr12RXGtWHAOk2LIGI02r4WBE4s= X-Received: by 2002:aca:1c19:: with SMTP id c25-v6mr22419061oic.246.1540195056963; Mon, 22 Oct 2018 00:57:36 -0700 (PDT) MIME-Version: 1.0 References: <20181018074704.23835-1-omosnace@redhat.com> <45457a65-93f0-b93b-876b-6e9216a8754b@tycho.nsa.gov> In-Reply-To: From: Ondrej Mosnacek Date: Mon, 22 Oct 2018 09:57:25 +0200 Message-ID: Subject: Re: [PATCH v4] selinux: policydb - fix byte order and alignment issues To: William Roberts Cc: Stephen Smalley , selinux@vger.kernel.org, Paul Moore , stable@vger.kernel.org, Doug Ledford , SElinux list , Eli Cohen Content-Type: text/plain; charset="UTF-8" Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org On Sat, Oct 20, 2018 at 3:05 AM William Roberts wrote: > On Fri, Oct 19, 2018 at 7:28 AM Stephen Smalley wrote: > > > > On 10/18/2018 03:47 AM, Ondrej Mosnacek wrote: > > > Do the LE conversions before doing the Infiniband-related range checks. > > > The incorrect checks are otherwise causing a failure to load any policy > > > with an ibendportcon rule on BE systems. This can be reproduced by > > > running (on e.g. ppc64): > > > > > > cat >my_module.cil < > > (type test_ibendport_t) > > > (roletype object_r test_ibendport_t) > > > (ibendportcon mlx4_0 1 (system_u object_r test_ibendport_t ((s0) (s0)))) > > > EOF > > > semodule -i my_module.cil > > > > > > Also, fix loading/storing the 64-bit subnet prefix for OCON_IBPKEY to > > > use a correctly aligned buffer. > > > > > > Finally, do not use the 'nodebuf' (u32) buffer where 'buf' (__le32) > > > should be used instead. > > > > > > Tested internally on a ppc64 machine with a RHEL 7 kernel with this > > > patch applied. > > > > > > Cc: Daniel Jurgens > > > Cc: Eli Cohen > > > Cc: James Morris > > > Cc: Doug Ledford > > > Cc: # 4.13+ > > > Fixes: a806f7a1616f ("selinux: Create policydb version for Infiniband support") > > > Signed-off-by: Ondrej Mosnacek > > > --- > > > security/selinux/ss/policydb.c | 46 +++++++++++++++++++++++----------- > > > 1 file changed, 32 insertions(+), 14 deletions(-) > > > > > > Changes in v4: > > > - defer assignment to 16-bit struct fields to after the range check > > > > > > Changes in v3: > > > - use separate buffer for the 64-bit subnet_prefix > > > - add comments on the byte ordering of subnet_prefix > > > - deduplicate the le32_to_cpu() calls from checks > > > > > > Changes in v2: > > > - add reproducer to commit message > > > - update e-mail address of James Morris > > > - better Cc also the old SELinux ML > > > > > > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > > > index f4eadd3f7350..d50668006a52 100644 > > > --- a/security/selinux/ss/policydb.c > > > +++ b/security/selinux/ss/policydb.c > > > @@ -2108,6 +2108,7 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, > > > { > > > int i, j, rc; > > > u32 nel, len; > > > + __be64 prefixbuf[1]; > > > __le32 buf[3]; > > > struct ocontext *l, *c; > > > u32 nodebuf[8]; > > > @@ -2217,21 +2218,30 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, > > > goto out; > > > break; > > > } > > > - case OCON_IBPKEY: > > > - rc = next_entry(nodebuf, fp, sizeof(u32) * 4); > > > + case OCON_IBPKEY: { > > > + u32 pkey_lo, pkey_hi; > > > + > > > + rc = next_entry(prefixbuf, fp, sizeof(u64)); > > > + if (rc) > > > + goto out; > > > + > > > + /* we need to have subnet_prefix in CPU order */ > > > + c->u.ibpkey.subnet_prefix = be64_to_cpu(prefixbuf[0]); > > > + > > > + rc = next_entry(buf, fp, sizeof(u32) * 2); > > > if (rc) > > > goto out; > > > > > > - c->u.ibpkey.subnet_prefix = be64_to_cpu(*((__be64 *)nodebuf)); > > > + pkey_lo = le32_to_cpu(buf[0]); > > > + pkey_hi = le32_to_cpu(buf[1]); > > > > > > - if (nodebuf[2] > 0xffff || > > > - nodebuf[3] > 0xffff) { > > > + if (pkey_lo > U16_MAX || pkey_hi > U16_MAX) { > > > rc = -EINVAL; > > > goto out; > > > } > > > > > > - c->u.ibpkey.low_pkey = le32_to_cpu(nodebuf[2]); > > > - c->u.ibpkey.high_pkey = le32_to_cpu(nodebuf[3]); > > > + c->u.ibpkey.low_pkey = pkey_lo; > > > + c->u.ibpkey.high_pkey = pkey_hi; > > > > > > rc = context_read_and_validate(&c->context[0], > > > p, > > > @@ -2239,6 +2249,7 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, > > > if (rc) > > > goto out; > > > break; > > > + } > > > case OCON_IBENDPORT: > > > rc = next_entry(buf, fp, sizeof(u32) * 2); > > > if (rc) > > > @@ -2249,13 +2260,14 @@ static int ocontext_read(struct policydb *p, struct policydb_compat_info *info, > > > if (rc) > > > goto out; > > > > > > - if (buf[1] > 0xff || buf[1] == 0) { > > > + c->u.ibendport.port = le32_to_cpu(buf[1]); > > > > ibendport.port is a u8 here, same issue. > > Good catch. Which made me notice this hunk is absent from the > userspace side and the userspace code has the same issue. > If we fix it up here in this patch we should be doing the same in the > libsepol patch. That's because there is no such check in libsepol... I guess it should really be there, though. Let me add it in a separate patch... > > > > > > + > > > + if (c->u.ibendport.port > 0xff || > > > + c->u.ibendport.port == 0) { > > > rc = -EINVAL; > > > goto out; > > > } > > > > > > - c->u.ibendport.port = le32_to_cpu(buf[1]); > > > - > > > rc = context_read_and_validate(&c->context[0], > > > p, > > > fp); > > > @@ -3105,6 +3117,7 @@ static int ocontext_write(struct policydb *p, struct policydb_compat_info *info, > > > { > > > unsigned int i, j, rc; > > > size_t nel, len; > > > + __be64 prefixbuf[1]; > > > __le32 buf[3]; > > > u32 nodebuf[8]; > > > struct ocontext *c; > > > @@ -3192,12 +3205,17 @@ static int ocontext_write(struct policydb *p, struct policydb_compat_info *info, > > > return rc; > > > break; > > > case OCON_IBPKEY: > > > - *((__be64 *)nodebuf) = cpu_to_be64(c->u.ibpkey.subnet_prefix); > > > + /* subnet_prefix is in CPU order */ > > > + prefixbuf[0] = cpu_to_be64(c->u.ibpkey.subnet_prefix); > > > > > > - nodebuf[2] = cpu_to_le32(c->u.ibpkey.low_pkey); > > > - nodebuf[3] = cpu_to_le32(c->u.ibpkey.high_pkey); > > > + rc = put_entry(prefixbuf, sizeof(u64), 1, fp); > > > + if (rc) > > > + return rc; > > > > > > - rc = put_entry(nodebuf, sizeof(u32), 4, fp); > > > + buf[0] = cpu_to_le32(c->u.ibpkey.low_pkey); > > > + buf[1] = cpu_to_le32(c->u.ibpkey.high_pkey); > > > + > > > + rc = put_entry(buf, sizeof(u32), 2, fp); > > > if (rc) > > > return rc; > > > rc = context_write(p, &c->context[0], fp); > > > > > > > _______________________________________________ > > Selinux mailing list > > Selinux@tycho.nsa.gov > > To unsubscribe, send email to Selinux-leave@tycho.nsa.gov. > > To get help, send an email containing "help" to Selinux-request@tycho.nsa.gov. -- Ondrej Mosnacek Associate Software Engineer, Security Technologies Red Hat, Inc.