From: David Quigley <merlin@countercultured.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Paris <eparis@redhat.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
David Quigley <dpquigl@davequigley.com>,
"Matthew N. Dodd" <Matthew.Dodd@sparta.com>,
Miguel Rodel Felipe <Rodel_FM@dsi.a-star.edu.sg>,
Phua Eu Gene <PHUA_Eu_Gene@dsi.a-star.edu.sg>,
Khin Mi Mi Aung <Mi_Mi_AUNG@dsi.a-star.edu.sg>,
Trond Myklebust <Trond.Myklebust@netapp.com>
Subject: Re: linux-next: manual merge of the selinux tree with Linus' tree
Date: Thu, 25 Jul 2013 21:22:48 -0700 [thread overview]
Message-ID: <06EC4DE7-7DC5-4C80-BA1D-2A96527CA7BF@countercultured.net> (raw)
In-Reply-To: <20130726134823.e4c0a1b7bad087c12b3ce782@canb.auug.org.au>
I guess my signed off got stripped somewhere. Originally I maintained those commits but Steve Dickson from red hat picked them up and they then made it into trond's tree and then into Linus'.
I unfortunately don't have my davequigley.com identities on my iPhone but you can add a sign off by dpquigl@davequigley.com for the commit.
Sent from my iPhone
On Jul 25, 2013, at 8:48 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Eric,
>
> Today's linux-next merge of the selinux tree got a conflict in
> security/selinux/hooks.c between commit eb9ae686507b ("SELinux: Add new
> labeling type native labels") from Linus' tree and commits 40d3d0b85fa2
> ("SELinux: remove crazy contortions around proc") and a64c54cf0811
> ("SELinux: pass a superblock to security_fs_use") from the selinux tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> P.S. Unusually, that commit from Linus' tree has no Signed-off-by from
> its purported author (David Quigley).
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> diff --cc security/selinux/hooks.c
> index a5091ec,4fbf2c5..0000000
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@@ -680,21 -702,14 +712,19 @@@ static int selinux_set_mnt_opts(struct
> if (strcmp(sb->s_type->name, "proc") == 0)
> sbsec->flags |= SE_SBPROC;
>
> - /* Determine the labeling behavior to use for this filesystem type. */
> - rc = security_fs_use(sb);
> - if (rc) {
> - printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n",
> - __func__, sb->s_type->name, rc);
> - goto out;
> + if (!sbsec->behavior) {
> + /*
> + * Determine the labeling behavior to use for this
> + * filesystem type.
> + */
> - rc = security_fs_use((sbsec->flags & SE_SBPROC) ?
> - "proc" : sb->s_type->name,
> - &sbsec->behavior, &sbsec->sid);
> ++ rc = security_fs_use(sb);
> + if (rc) {
> + printk(KERN_WARNING
> + "%s: security_fs_use(%s) returned %d\n",
> + __func__, sb->s_type->name, rc);
> + goto out;
> + }
> }
> -
> /* sets the context of the superblock for the fs being mounted. */
> if (fscontext_sid) {
> rc = may_context_mount_sb_relabel(fscontext_sid, sbsec, cred);
> @@@ -2629,11 -2589,15 +2659,11 @@@ static int selinux_inode_init_security(
> isec->initialized = 1;
> }
>
> - if (!ss_initialized || !(sbsec->flags & SE_SBLABELSUPP))
> + if (!ss_initialized || !(sbsec->flags & SBLABEL_MNT))
> return -EOPNOTSUPP;
>
> - if (name) {
> - namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_NOFS);
> - if (!namep)
> - return -ENOMEM;
> - *name = namep;
> - }
> + if (name)
> + *name = XATTR_SELINUX_SUFFIX;
>
> if (value && len) {
> rc = security_sid_to_context_force(newsid, &context, &clen);
next prev parent reply other threads:[~2013-07-26 4:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 3:48 linux-next: manual merge of the selinux tree with Linus' tree Stephen Rothwell
2013-07-26 4:22 ` David Quigley [this message]
2013-07-26 7:38 ` Stephen Rothwell
2017-05-22 2:38 Stephen Rothwell
2017-05-22 21:08 ` Paul Moore
2017-05-22 21:13 ` Daniel Jurgens
2020-02-12 22:48 Stephen Rothwell
2020-02-12 23:03 ` Paul Moore
2021-09-21 1:17 Stephen Rothwell
2021-09-21 14:43 ` Paul Moore
2022-11-10 1:44 Stephen Rothwell
2022-11-10 2:26 ` Paul Moore
2023-06-05 0:52 Stephen Rothwell
2023-06-05 20:47 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=06EC4DE7-7DC5-4C80-BA1D-2A96527CA7BF@countercultured.net \
--to=merlin@countercultured.net \
--cc=Matthew.Dodd@sparta.com \
--cc=Mi_Mi_AUNG@dsi.a-star.edu.sg \
--cc=PHUA_Eu_Gene@dsi.a-star.edu.sg \
--cc=Rodel_FM@dsi.a-star.edu.sg \
--cc=Trond.Myklebust@netapp.com \
--cc=dpquigl@davequigley.com \
--cc=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).