diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-09-13 12:23:11 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-09-13 12:23:15 -0400 |
| commit | e101f070dbc19874c6a16c4f450d03a771dc3cf4 (patch) | |
| tree | 87cb87e960be60142e49bffe1e591510da33bf37 | |
| parent | 5b6256afd7b5e4ea094b583a9a6a5aab6b2f1ec3 (diff) | |
| download | kernel-e101f070dbc19874c6a16c4f450d03a771dc3cf4.tar.gz kernel-e101f070dbc19874c6a16c4f450d03a771dc3cf4.tar.xz kernel-e101f070dbc19874c6a16c4f450d03a771dc3cf4.zip | |
Add patch to fix btrfs build on ARM
| -rw-r--r-- | fix-arm-btrfs-build.patch | 14 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/fix-arm-btrfs-build.patch b/fix-arm-btrfs-build.patch new file mode 100644 index 000000000..7e33f29b9 --- /dev/null +++ b/fix-arm-btrfs-build.patch @@ -0,0 +1,14 @@ +diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h +index 7e1f760..05c9825 100644 +--- a/arch/arm/include/asm/uaccess.h ++++ b/arch/arm/include/asm/uaccess.h +@@ -417,6 +417,9 @@ do { \ + : "cc") + + ++#define __get_user_unaligned(x, ptr) __get_user((x), (ptr)) ++#define __put_user_unaligned(x, ptr) __put_user((x), (ptr)) ++ + #ifdef CONFIG_MMU + extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n); + extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n); diff --git a/kernel.spec b/kernel.spec index 557c81e67..97cbf4de5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -768,6 +768,7 @@ Patch25100: tuntap-correctly-handle-error-in-tun_set_iff.patch Patch25102: net-sctp-fix-ipv6-ipsec-encryption-bug-in-sctp_v6_xmit.patch Patch25101: fix-arm-neon-xor.patch +Patch25103: fix-arm-btrfs-build.patch # END OF PATCH DEFINITIONS @@ -1491,6 +1492,7 @@ ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch ApplyPatch HID-CVE-fixes.patch ApplyPatch fix-arm-neon-xor.patch +ApplyPatch fix-arm-btrfs-build.patch #CVE-2013-4343 rhbz 1007733 1007741 ApplyPatch tuntap-correctly-handle-error-in-tun_set_iff.patch @@ -2300,6 +2302,7 @@ fi # || || %changelog * Fri Sep 13 2013 Josh Boyer <jwboyer@fedoraproject.org> +- Add patch to fix btrfs build on ARM - CVE-2013-XXXX net: sctp: ipv6 ipsec encryption bug in sctp_v6_xmit (rhbz 1007872 1007903) - CVE-2013-4343 net: use-after-free TUNSETIFF (rhbz 1007733 1007741) |