diff options
author | Yannick GICQUEL <yannick.gicquel@iot.bzh> | 2015-10-19 15:57:07 +0200 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.200> | 2015-11-06 15:23:36 +0000 |
commit | ede19ea0c47fb23f3fc779833d1e57cf76f3371e (patch) | |
tree | 47d6fae2283c54def1871aaf2a73828ac68b1b34 /meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0053-Smack-Repair-netfilter-dependency.patch | |
parent | 1cd8ab18abca96e4ee108f80225058d875b28347 (diff) |
kernel: smack security backport from kernel 4
Here is the backport of all patches relating to smack support
on kernel side. For more details, see file:
meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/README
Please note that patches are applied only if "smack" is in the
ditro features. Here are the 2 lines to add in the local.conf
OVERRIDES .= ":smack"
DISTRO_FEATURES_append = " smack"
Change-Id: I147a3532aec531f977d6ec34c576261835711f1e
Signed-off-by: Yannick GICQUEL <yannick.gicquel@iot.bzh>
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0053-Smack-Repair-netfilter-dependency.patch')
-rw-r--r-- | meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0053-Smack-Repair-netfilter-dependency.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0053-Smack-Repair-netfilter-dependency.patch b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0053-Smack-Repair-netfilter-dependency.patch new file mode 100644 index 0000000..3e2a081 --- /dev/null +++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/smack/0053-Smack-Repair-netfilter-dependency.patch @@ -0,0 +1,39 @@ +From 31bb2085e178585b3c04b46da686429bf916b39c Mon Sep 17 00:00:00 2001 +From: Casey Schaufler <casey@schaufler-ca.com> +Date: Fri, 23 Jan 2015 09:31:01 -0800 +Subject: [PATCH 53/54] Smack: Repair netfilter dependency +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On 1/23/2015 8:20 AM, Jim Davis wrote: +> Building with the attached random configuration file, +> +> security/smack/smack_netfilter.c: In function ‘smack_ipv4_output’: +> security/smack/smack_netfilter.c:55:6: error: ‘struct sk_buff’ has no +> member named ‘secmark’ +> skb->secmark = skp->smk_secid; +> ^ +> make[2]: *** [security/smack/smack_netfilter.o] Error 1 + +The existing Makefile used the wrong configuration option to +determine if smack_netfilter should be built. This sets it right. + +Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> +--- + security/smack/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/security/smack/Makefile b/security/smack/Makefile +index 616cf93..ee2ebd5 100644 +--- a/security/smack/Makefile ++++ b/security/smack/Makefile +@@ -5,4 +5,4 @@ + obj-$(CONFIG_SECURITY_SMACK) := smack.o + + smack-y := smack_lsm.o smack_access.o smackfs.o +-smack-$(CONFIG_NETFILTER) += smack_netfilter.o ++smack-$(CONFIG_SECURITY_SMACK_NETFILTER) += smack_netfilter.o +-- +2.1.4 + |