diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2013-07-09 16:19:07 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2013-07-09 16:19:07 -0500 |
| commit | e1d6f3889c1511a6e17e19849db17e5c607664da (patch) | |
| tree | a4dd3f4b90843d7e4db06c5a25be9b42547f935b | |
| parent | 650cdc7e7507de6b345ec58080502bd1a3e120a2 (diff) | |
| download | kernel-e1d6f3889c1511a6e17e19849db17e5c607664da.tar.gz kernel-e1d6f3889c1511a6e17e19849db17e5c607664da.tar.xz kernel-e1d6f3889c1511a6e17e19849db17e5c607664da.zip | |
Linux v3.10-6378-ga82a729
| -rw-r--r-- | config-generic | 5 | ||||
| -rw-r--r-- | fanotify-info-leak-in-copy_event_to_user.patch | 14 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 10 insertions, 22 deletions
diff --git a/config-generic b/config-generic index 48d14bad9..d35de6c16 100644 --- a/config-generic +++ b/config-generic @@ -3815,6 +3815,8 @@ CONFIG_NFS_V4=y CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_2=y +NFS_V4_SECURITY_LABEL=y CONFIG_NFSD=m CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y @@ -3890,6 +3892,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_PARTITION_ADVANCED=y # CONFIG_ACORN_PARTITION is not set +CONFIG_AIX_PARTITION=y CONFIG_AMIGA_PARTITION=y # CONFIG_ATARI_PARTITION is not set CONFIG_BSD_DISKLABEL=y @@ -4108,6 +4111,8 @@ CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZO=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_MICHAEL_MIC=m diff --git a/fanotify-info-leak-in-copy_event_to_user.patch b/fanotify-info-leak-in-copy_event_to_user.patch deleted file mode 100644 index 92b218b1c..000000000 --- a/fanotify-info-leak-in-copy_event_to_user.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c -index 6c80083..77cc85d 100644 ---- a/fs/notify/fanotify/fanotify_user.c -+++ b/fs/notify/fanotify/fanotify_user.c -@@ -122,6 +122,7 @@ static int fill_event_metadata(struct fsnotify_group *group, - metadata->event_len = FAN_EVENT_METADATA_LEN; - metadata->metadata_len = FAN_EVENT_METADATA_LEN; - metadata->vers = FANOTIFY_METADATA_VERSION; -+ metadata->reserved = 0; - metadata->mask = event->mask & FAN_ALL_OUTGOING_EVENTS; - metadata->pid = pid_vnr(event->tgid); - if (unlikely(event->mask & FAN_Q_OVERFLOW)) - -
\ No newline at end of file diff --git a/kernel.spec b/kernel.spec index bb5b39080..cecf34957 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -762,9 +762,6 @@ Patch25031: xen-blkback-Check-device-permissions-before-allowing.patch #CVE-2013-2147 rhbz 971242 971249 Patch25032: cve-2013-2147-ciss-info-leak.patch -#CVE-2013-2148 rhbz 971258 971261 -Patch25033: fanotify-info-leak-in-copy_event_to_user.patch - Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch #rhbz 880035 @@ -1471,9 +1468,6 @@ ApplyPatch xen-blkback-Check-device-permissions-before-allowing.patch #CVE-2013-2147 rhbz 971242 971249 ApplyPatch cve-2013-2147-ciss-info-leak.patch -#CVE-2013-2148 rhbz 971258 971261 -ApplyPatch fanotify-info-leak-in-copy_event_to_user.patch - ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch #rhbz 880035 @@ -2287,6 +2281,9 @@ fi # ||----w | # || || %changelog +* Tue Jul 09 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git3.1 +- Linux v3.10-6378-ga82a729 + * Mon Jul 8 2013 Peter Robinson <pbrobinson@fedoraproject.org> - Initial ARM config for 3.11 @@ -1,2 +1,2 @@ 4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz -be862c063de23555e7f6d0b3c9b9544f patch-3.10-git2.xz +bafe9ce838f3bc7e98307fdbb21e714b patch-3.10-git3.xz |