From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
James Morris <jmorris@namei.org>
Cc: Paul Moore <paul@paul-moore.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ursula Braun <ubraun@linux.vnet.ibm.com>,
Stephen Smalley <sds@tycho.nsa.gov>
Subject: Re: linux-next: build failure after merge of the selinux tree
Date: Fri, 10 Feb 2017 13:50:15 +1100 [thread overview]
Message-ID: <20170210135015.7a573b81@canb.auug.org.au> (raw)
In-Reply-To: <20170110122703.2dbdfd18@canb.auug.org.au>
Hi all,
On Tue, 10 Jan 2017 12:27:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the selinux tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from /home/sfr/next/next/security/selinux/avc.c:35:0:
> /home/sfr/next/next/security/selinux/include/classmap.h:242:2: error: #error New address family defined, please update secclass_map.
> #error New address family defined, please update secclass_map.
> ^
> /home/sfr/next/next/security/selinux/hooks.c: In function 'socket_type_to_security_class':
> /home/sfr/next/next/security/selinux/hooks.c:1409:2: error: #error New address family defined, please update this function.
>
> Caused by commit
>
> da69a5306ab9 ("selinux: support distinctions among all network address families")
>
> interacting with commit
>
> ac7138746e14 ("smc: establish new socket family")
>
> from the net-next tree.
>
> I added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Jan 2017 12:22:21 +1100
> Subject: [PATCH] selinux: merge fix for "smc: establish new socket family"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> security/selinux/hooks.c | 4 +++-
> security/selinux/include/classmap.h | 4 +++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index bada3cd42b9c..712fd0e7c91d 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -1405,7 +1405,9 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc
> return SECCLASS_KCM_SOCKET;
> case PF_QIPCRTR:
> return SECCLASS_QIPCRTR_SOCKET;
> -#if PF_MAX > 43
> + case PF_SMC:
> + return SECCLASS_SMC_SOCKET;
> +#if PF_MAX > 44
> #error New address family defined, please update this function.
> #endif
> }
> diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
> index 0dfd26d0b8d8..40f1d4f8bc2a 100644
> --- a/security/selinux/include/classmap.h
> +++ b/security/selinux/include/classmap.h
> @@ -235,9 +235,11 @@ struct security_class_mapping secclass_map[] = {
> { COMMON_SOCK_PERMS, NULL } },
> { "qipcrtr_socket",
> { COMMON_SOCK_PERMS, NULL } },
> + { "smc_socket",
> + { COMMON_SOCK_PERMS, NULL } },
> { NULL }
> };
>
> -#if PF_MAX > 43
> +#if PF_MAX > 44
> #error New address family defined, please update secclass_map.
> #endif
> --
> 2.10.2
This now applies when I merge the security tree (as it merged the
selinux tree, presumably).
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-02-10 2:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 1:27 linux-next: build failure after merge of the selinux tree Stephen Rothwell
2017-01-11 3:11 ` Paul Moore
2017-02-10 2:50 ` Stephen Rothwell [this message]
2017-02-10 12:34 ` Paul Moore
-- strict thread matches above, loose matches on Subject: below --
2024-03-27 2:10 Stephen Rothwell
2024-03-27 13:13 ` Paul Moore
2021-10-05 3:10 Stephen Rothwell
2021-10-05 13:57 ` Paul Moore
2019-12-10 1:40 Stephen Rothwell
2019-12-10 2:25 ` Paul Moore
2019-04-03 1:22 Stephen Rothwell
2019-04-03 1:25 ` Paul Moore
2019-03-19 1:40 Stephen Rothwell
2019-03-19 17:11 ` Paul Moore
2017-05-22 2:48 Stephen Rothwell
2017-05-22 21:12 ` Paul Moore
2017-05-22 21:16 ` Daniel Jurgens
2012-01-05 4:24 Stephen Rothwell
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=20170210135015.7a573b81@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=sds@tycho.nsa.gov \
--cc=ubraun@linux.vnet.ibm.com \
/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).