From ada8d1aaf15b3a293c434542e3581754fea3d9f1 Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 10 May 2016 08:31:48 +0200 Subject: Revert "kernel ipc: fix compat msgrcv with negative msgtyp" The patch was intergrated by Freescale into meta-fsl-ppc into krogoth and krogoth-next branches(commit 324d71e3ef072d17bd6c03973b1d24150fe471ce). This reverts commit 324d71e3ef072d17bd6c03973b1d24150fe471ce. --- ...pc-fix-compat-msgrcv-with-negative-msgtyp.patch | 27 ---------------------- recipes-kernel/linux/linux-qoriq_3.12.bbappend | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 recipes-kernel/linux/files/Trusty-SRU-ipc-fix-compat-msgrcv-with-negative-msgtyp.patch diff --git a/recipes-kernel/linux/files/Trusty-SRU-ipc-fix-compat-msgrcv-with-negative-msgtyp.patch b/recipes-kernel/linux/files/Trusty-SRU-ipc-fix-compat-msgrcv-with-negative-msgtyp.patch deleted file mode 100644 index b90a114..0000000 --- a/recipes-kernel/linux/files/Trusty-SRU-ipc-fix-compat-msgrcv-with-negative-msgtyp.patch +++ /dev/null @@ -1,27 +0,0 @@ -BugLink: http://bugs.launchpad.net/bugs/1393355 - -Compat function takes msgtyp argument as u32 and passes it down to -do_msgrcv which results in casting to long, thus the sign is lost and we -get a big positive number instead. - -Cast the argument to signed type before passing it down. - -Signed-off-by: Mateusz Guzik -Reported-by: Gabriellla Schmidt - -Upstream-Status::Backport -Kernel 3.14 - -diff --git a/ipc/compat.c b/ipc/compat.c -index 892f658..d3b3760 100644 ---- a/ipc/compat.c -+++ b/ipc/compat.c -@@ -381,7 +381,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second, - uptr = compat_ptr(ipck.msgp); - fifth = ipck.msgtyp; - } -- return do_msgrcv(first, uptr, second, fifth, third, -+ return do_msgrcv(first, uptr, second, (s32)fifth, third, - compat_do_msg_fill); - } - case MSGGET: diff --git a/recipes-kernel/linux/linux-qoriq_3.12.bbappend b/recipes-kernel/linux/linux-qoriq_3.12.bbappend index bd21278..f9311e9 100644 --- a/recipes-kernel/linux/linux-qoriq_3.12.bbappend +++ b/recipes-kernel/linux/linux-qoriq_3.12.bbappend @@ -1,3 +1 @@ require recipes-kernel/linux/linux-qoriq-common.inc -SRC_URI += "file://Trusty-SRU-ipc-fix-compat-msgrcv-with-negative-msgtyp.patch \ - " -- cgit v1.2.3-54-g00ecf