summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-07-25 08:18:02 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-07-25 08:18:07 -0400
commitd35b963d10bf461f1f3b5dd10979f895101afc9b (patch)
treef69eff7850227a776003ec6e03a42be7a694396b /kernel.spec
parentf12a594c2d6e1a3cb7e9afcc917dcc41b7a27bd3 (diff)
downloadkernel-d35b963d10bf461f1f3b5dd10979f895101afc9b.tar.gz
kernel-d35b963d10bf461f1f3b5dd10979f895101afc9b.tar.xz
kernel-d35b963d10bf461f1f3b5dd10979f895101afc9b.zip
Fix selinux sock_graft hook for AF_ALG address family (rhbz 1115120)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index ce514e750..8840dc8e9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -642,6 +642,9 @@ Patch25118: sched-fix-sched_setparam-policy-1-logic.patch
#CVE-2014-5045 rhbz 1122472 1122482
Patch25119: fs-umount-on-symlink-leaks-mnt-count.patch
+#rhbz 1115120
+Patch25120: selinux-4da6daf4d3df5a977e4623963f141a627fd2efce.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1370,6 +1373,9 @@ ApplyPatch sched-fix-sched_setparam-policy-1-logic.patch
#CVE-2014-5045 rhbz 1122472 1122482
ApplyPatch fs-umount-on-symlink-leaks-mnt-count.patch
+#rhbz 1115120
+ApplyPatch selinux-4da6daf4d3df5a977e4623963f141a627fd2efce.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2252,6 +2258,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Jul 25 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix selinux sock_graft hook for AF_ALG address family (rhbz 1115120)
+
* Thu Jul 24 2014 Kyle McMartin <kyle@fedoraproject.org>
- kernel-arm64.patch: update from upstream git.
- arm64: update config-arm64 to include PCI support.