From: Sasha Levin Date: Fri, 26 Jun 2020 18:07:37 +0000 (-0400) Subject: Fixes for 4.9 X-Git-Tag: v5.7.7~61^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e59ed0fddd1251a0e9b420ebee673b9adb48bfd0;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/fix-a-braino-in-sparc32-fix-register-window-handling.patch b/queue-4.9/fix-a-braino-in-sparc32-fix-register-window-handling.patch new file mode 100644 index 00000000000..c8f2a66f991 --- /dev/null +++ b/queue-4.9/fix-a-braino-in-sparc32-fix-register-window-handling.patch @@ -0,0 +1,46 @@ +From 44bf3022e08f9369b83187de005d92efeae46a98 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Jun 2020 23:44:24 -0400 +Subject: fix a braino in "sparc32: fix register window handling in + genregs32_[gs]et()" + +From: Al Viro + +[ Upstream commit 9d964e1b82d8182184153b70174f445ea616f053 ] + +lost npc in PTRACE_SETREGSET, breaking PTRACE_SETREGS as well + +Fixes: cf51e129b968 "sparc32: fix register window handling in genregs32_[gs]et()" +Signed-off-by: Al Viro +Signed-off-by: Sasha Levin +--- + arch/sparc/kernel/ptrace_32.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c +index 396dbdea0cfa0..2f4316c142664 100644 +--- a/arch/sparc/kernel/ptrace_32.c ++++ b/arch/sparc/kernel/ptrace_32.c +@@ -167,12 +167,17 @@ static int genregs32_set(struct task_struct *target, + if (ret || !count) + return ret; + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, +- ®s->y, ++ ®s->npc, + 34 * sizeof(u32), 35 * sizeof(u32)); + if (ret || !count) + return ret; ++ ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, ++ ®s->y, ++ 35 * sizeof(u32), 36 * sizeof(u32)); ++ if (ret || !count) ++ return ret; + return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf, +- 35 * sizeof(u32), 38 * sizeof(u32)); ++ 36 * sizeof(u32), 38 * sizeof(u32)); + } + + static int fpregs32_get(struct task_struct *target, +-- +2.25.1 + diff --git a/queue-4.9/net-sched-export-__netdev_watchdog_up.patch b/queue-4.9/net-sched-export-__netdev_watchdog_up.patch new file mode 100644 index 00000000000..f35b63a1187 --- /dev/null +++ b/queue-4.9/net-sched-export-__netdev_watchdog_up.patch @@ -0,0 +1,42 @@ +From 22f6684658130703343bd1a3e5495f447fc3351f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Jun 2020 22:11:54 +0200 +Subject: net: sched: export __netdev_watchdog_up() + +From: Valentin Longchamp + +[ Upstream commit 1a3db27ad9a72d033235b9673653962c02e3486e ] + +Since the quiesce/activate rework, __netdev_watchdog_up() is directly +called in the ucc_geth driver. + +Unfortunately, this function is not available for modules and thus +ucc_geth cannot be built as a module anymore. Fix it by exporting +__netdev_watchdog_up(). + +Since the commit introducing the regression was backported to stable +branches, this one should ideally be as well. + +Fixes: 79dde73cf9bc ("net/ethernet/freescale: rework quiesce/activate for ucc_geth") +Signed-off-by: Valentin Longchamp +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/sched/sch_generic.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c +index 88ce8edf12614..04ca08f852209 100644 +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c +@@ -337,6 +337,7 @@ void __netdev_watchdog_up(struct net_device *dev) + dev_hold(dev); + } + } ++EXPORT_SYMBOL_GPL(__netdev_watchdog_up); + + static void dev_watchdog_up(struct net_device *dev) + { +-- +2.25.1 + diff --git a/queue-4.9/series b/queue-4.9/series index 25484efe102..d38a2626a99 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -127,3 +127,5 @@ mtd-rawnand-mtk-fix-the-probe-error-path.patch mtd-rawnand-tmio-fix-the-probe-error-path.patch scsi-scsi_devinfo-handle-non-terminated-strings.patch l2tp-allow-duplicate-session-creation-with-udp.patch +net-sched-export-__netdev_watchdog_up.patch +fix-a-braino-in-sparc32-fix-register-window-handling.patch