| Message ID | c78cf83ee2558c57069cb0fdb6c2ef52089e8d29.1525347487.9020927.git.juergh@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Xenial,PULL] Xenial update to 4.4.130 stable release | expand |
On 05/03/18 13:54, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1768474 > > This is a pull request for the update of Xenial to upstream stable release 4.4.130. > > This update pulls in upstream's version of the spectre mitigation for s390 > which doesn't provide a 'nogmb' kernel parameter. The following two SAUCE > patches add the missing features back so that the original Xenial behavior is > preserved: > * UBUNTU: SAUCE: s390: print messages for gmb and nobp > * UBUNTU: SAUCE: s390: Add 'nogmb' kernel parameter > > Skipped the following patch (already applied): > * KVM: s390: wire up bpb feature > > Some patches required trivial context adjustement. > Compile-tested all supported architectures. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > > The following changes since commit b43fcb6022f9e1365e94caf773e4793b1bc93595: > > Linux 4.4.129 (2018-05-03 10:23:53 +0200) > > are available in the Git repository at: > > https://git.launchpad.net/~juergh/+git/xenial-linux update-4.4.130 > > for you to fetch changes up to c78cf83ee2558c57069cb0fdb6c2ef52089e8d29: > > UBUNTU: SAUCE: s390: print messages for gmb and nobp (2018-05-03 11:47:13 +0200) Applied to xenial/master-next branch. Thanks, Kleber > > ---------------------------------------------------------------- > Chen Feng (1): > staging: ion : Donnot wakeup kswapd in ion system alloc > > Christian Borntraeger (1): > s390/entry.S: fix spurious zeroing of r0 > > Cong Wang (3): > llc: delete timers synchronously in llc_sk_free() > llc: hold llc_sap before release_sock() > llc: fix NULL pointer deref for SOCK_ZAPPED > > Dan Carpenter (1): > cdrom: information leak in cdrom_ioctl_media_changed() > > Dmitry Torokhov (1): > Input: drv260x - fix initializing overdrive voltage > > Eric Biggers (1): > KEYS: DNS: limit the length of option strings > > Eric Dumazet (5): > net: validate attribute sizes in neigh_dump_table() > tipc: add policy for TIPC_NLA_NET_ADDR > tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets > net: af_packet: fix race in PACKET_{R|T}X_RING > ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy > > Eugeniu Rosca (1): > s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*) > > Felix Fietkau (1): > ath9k_hw: check if the chip failed to wake up > > Grant Grundler (1): > r8152: add Linksys USB3GIGV1 id > > Greg Kroah-Hartman (1): > Linux 4.4.130 > > Guillaume Nault (2): > l2tp: check sockaddr length in pppol2tp_connect() > pppoe: check sockaddr length in pppoe_connect() > > Heiko Carstens (2): > s390: enable CPU alternatives unconditionally > s390/uprobes: implement arch_uretprobe_is_alive() > > Jann Horn (1): > tcp: don't read out-of-bounds opsize > > Jiri Olsa (1): > perf: Return proper values for user stack errors > > Juerg Haefliger (6): > Revert "UBUNTU: SAUCE: s390: print messages for gmb and nobp" > Revert "UBUNTU: SAUCE: s390: improve cpu alternative handling for gmb and nobp" > Revert "s390: add ppa to kernel entry / exit" > Revert "s390: introduce CPU alternatives" > UBUNTU: [Config] Add CONFIG_EXPOLINE=y and CONFIG_EXPOLINE_AUTO=y > UBUNTU: SAUCE: s390: Add 'nogmb' kernel parameter > > Karthikeyan Periyasamy (1): > Revert "ath10k: send (re)assoc peer command when NSS changed" > > Marcelo Henrique Cerri (1): > UBUNTU: SAUCE: s390: print messages for gmb and nobp > > Martin K. Petersen (1): > scsi: mptsas: Disable WRITE SAME > > Martin Schwidefsky (13): > s390/alternative: use a copy of the facility bit mask > s390: add options to change branch prediction behaviour for the kernel > s390: scrub registers on kernel entry and KVM exit > s390: add optimized array_index_mask_nospec > s390: run user space and KVM guests with modified branch prediction > s390: introduce execute-trampolines for branches > s390: do not bypass BPENTER for interrupt system calls > s390: move nobp parameter functions to nospec-branch.c > s390: add automatic detection of the spectre defense > s390: report spectre mitigation via syslog > s390: add sysfs attributes for spectre > s390: correct nospec auto detection init order > s390: correct module section names for expoline code revert > > Paolo Abeni (1): > team: avoid adding twice the same option to the event list > > Sahitya Tummala (1): > jbd2: fix use after free in kjournald2() > > Sebastian Ott (1): > s390/cio: update chpid descriptor after resource accessibility event > > Steve French (1): > cifs: do not allow creating sockets except with SMB1 posix exensions > > Toshiaki Makita (1): > vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi > > Vasily Gorbik (1): > s390: introduce CPU alternatives > > Willem de Bruijn (1): > packet: fix bitfield update race > > Wolfgang Bumiller (1): > net: fix deadlock while clearing neighbor proxy table > > Xiaoming Gao (1): > x86/tsc: Prevent 32bit truncation in calc_hpet_ref() > > Xin Long (3): > bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave > team: fix netconsole setup over team > sctp: do not check port in sctp_inet6_cmp_addr > > Documentation/kernel-parameters.txt | 3 + > Makefile | 2 +- > arch/s390/Kconfig | 64 ++++++-- > arch/s390/Makefile | 10 ++ > arch/s390/include/asm/alternative.h | 28 ++-- > arch/s390/include/asm/barrier.h | 24 +++ > arch/s390/include/asm/lowcore.h | 4 +- > arch/s390/include/asm/nospec-branch.h | 17 ++ > arch/s390/include/asm/processor.h | 3 + > arch/s390/include/asm/thread_info.h | 4 + > arch/s390/kernel/Makefile | 3 + > arch/s390/kernel/alternative.c | 26 +--- > arch/s390/kernel/entry.S | 213 ++++++++++++++++++++++---- > arch/s390/kernel/module.c | 62 ++++++-- > arch/s390/kernel/nospec-branch.c | 169 ++++++++++++++++++++ > arch/s390/kernel/processor.c | 19 ++- > arch/s390/kernel/setup.c | 7 + > arch/s390/kernel/smp.c | 1 + > arch/s390/kernel/uprobes.c | 9 ++ > arch/s390/kernel/vmlinux.lds.S | 14 ++ > arch/x86/kernel/tsc.c | 2 +- > debian.master/config/config.common.ubuntu | 4 + > drivers/cdrom/cdrom.c | 2 +- > drivers/input/misc/drv260x.c | 2 +- > drivers/message/fusion/mptsas.c | 1 + > drivers/net/bonding/bond_main.c | 3 +- > drivers/net/ppp/pppoe.c | 4 + > drivers/net/team/team.c | 38 ++++- > drivers/net/usb/cdc_ether.c | 10 ++ > drivers/net/usb/r8152.c | 2 + > drivers/net/wireless/ath/ath10k/mac.c | 5 +- > drivers/net/wireless/ath/ath9k/hw.c | 4 + > drivers/s390/char/Makefile | 2 + > drivers/s390/cio/chsc.c | 14 +- > drivers/staging/android/ion/ion_system_heap.c | 2 +- > fs/cifs/dir.c | 9 +- > fs/jbd2/journal.c | 2 +- > include/linux/if_vlan.h | 7 +- > include/net/llc_conn.h | 1 + > kernel/events/core.c | 4 +- > net/core/dev.c | 2 +- > net/core/neighbour.c | 40 +++-- > net/dns_resolver/dns_key.c | 13 +- > net/ipv4/tcp.c | 6 +- > net/ipv4/tcp_input.c | 7 +- > net/ipv6/route.c | 2 + > net/l2tp/l2tp_ppp.c | 7 + > net/llc/af_llc.c | 14 +- > net/llc/llc_c_ac.c | 9 +- > net/llc/llc_conn.c | 22 ++- > net/packet/af_packet.c | 88 +++++++---- > net/packet/internal.h | 10 +- > net/sctp/ipv6.c | 60 ++++---- > net/tipc/net.c | 3 +- > 54 files changed, 856 insertions(+), 227 deletions(-) > create mode 100644 arch/s390/include/asm/nospec-branch.h > create mode 100644 arch/s390/kernel/nospec-branch.c > >
BugLink: https://bugs.launchpad.net/bugs/1768474 This is a pull request for the update of Xenial to upstream stable release 4.4.130. This update pulls in upstream's version of the spectre mitigation for s390 which doesn't provide a 'nogmb' kernel parameter. The following two SAUCE patches add the missing features back so that the original Xenial behavior is preserved: * UBUNTU: SAUCE: s390: print messages for gmb and nobp * UBUNTU: SAUCE: s390: Add 'nogmb' kernel parameter Skipped the following patch (already applied): * KVM: s390: wire up bpb feature Some patches required trivial context adjustement. Compile-tested all supported architectures. Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- The following changes since commit b43fcb6022f9e1365e94caf773e4793b1bc93595: Linux 4.4.129 (2018-05-03 10:23:53 +0200) are available in the Git repository at: https://git.launchpad.net/~juergh/+git/xenial-linux update-4.4.130 for you to fetch changes up to c78cf83ee2558c57069cb0fdb6c2ef52089e8d29: UBUNTU: SAUCE: s390: print messages for gmb and nobp (2018-05-03 11:47:13 +0200) ---------------------------------------------------------------- Chen Feng (1): staging: ion : Donnot wakeup kswapd in ion system alloc Christian Borntraeger (1): s390/entry.S: fix spurious zeroing of r0 Cong Wang (3): llc: delete timers synchronously in llc_sk_free() llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED Dan Carpenter (1): cdrom: information leak in cdrom_ioctl_media_changed() Dmitry Torokhov (1): Input: drv260x - fix initializing overdrive voltage Eric Biggers (1): KEYS: DNS: limit the length of option strings Eric Dumazet (5): net: validate attribute sizes in neigh_dump_table() tipc: add policy for TIPC_NLA_NET_ADDR tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets net: af_packet: fix race in PACKET_{R|T}X_RING ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy Eugeniu Rosca (1): s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*) Felix Fietkau (1): ath9k_hw: check if the chip failed to wake up Grant Grundler (1): r8152: add Linksys USB3GIGV1 id Greg Kroah-Hartman (1): Linux 4.4.130 Guillaume Nault (2): l2tp: check sockaddr length in pppol2tp_connect() pppoe: check sockaddr length in pppoe_connect() Heiko Carstens (2): s390: enable CPU alternatives unconditionally s390/uprobes: implement arch_uretprobe_is_alive() Jann Horn (1): tcp: don't read out-of-bounds opsize Jiri Olsa (1): perf: Return proper values for user stack errors Juerg Haefliger (6): Revert "UBUNTU: SAUCE: s390: print messages for gmb and nobp" Revert "UBUNTU: SAUCE: s390: improve cpu alternative handling for gmb and nobp" Revert "s390: add ppa to kernel entry / exit" Revert "s390: introduce CPU alternatives" UBUNTU: [Config] Add CONFIG_EXPOLINE=y and CONFIG_EXPOLINE_AUTO=y UBUNTU: SAUCE: s390: Add 'nogmb' kernel parameter Karthikeyan Periyasamy (1): Revert "ath10k: send (re)assoc peer command when NSS changed" Marcelo Henrique Cerri (1): UBUNTU: SAUCE: s390: print messages for gmb and nobp Martin K. Petersen (1): scsi: mptsas: Disable WRITE SAME Martin Schwidefsky (13): s390/alternative: use a copy of the facility bit mask s390: add options to change branch prediction behaviour for the kernel s390: scrub registers on kernel entry and KVM exit s390: add optimized array_index_mask_nospec s390: run user space and KVM guests with modified branch prediction s390: introduce execute-trampolines for branches s390: do not bypass BPENTER for interrupt system calls s390: move nobp parameter functions to nospec-branch.c s390: add automatic detection of the spectre defense s390: report spectre mitigation via syslog s390: add sysfs attributes for spectre s390: correct nospec auto detection init order s390: correct module section names for expoline code revert Paolo Abeni (1): team: avoid adding twice the same option to the event list Sahitya Tummala (1): jbd2: fix use after free in kjournald2() Sebastian Ott (1): s390/cio: update chpid descriptor after resource accessibility event Steve French (1): cifs: do not allow creating sockets except with SMB1 posix exensions Toshiaki Makita (1): vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi Vasily Gorbik (1): s390: introduce CPU alternatives Willem de Bruijn (1): packet: fix bitfield update race Wolfgang Bumiller (1): net: fix deadlock while clearing neighbor proxy table Xiaoming Gao (1): x86/tsc: Prevent 32bit truncation in calc_hpet_ref() Xin Long (3): bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave team: fix netconsole setup over team sctp: do not check port in sctp_inet6_cmp_addr Documentation/kernel-parameters.txt | 3 + Makefile | 2 +- arch/s390/Kconfig | 64 ++++++-- arch/s390/Makefile | 10 ++ arch/s390/include/asm/alternative.h | 28 ++-- arch/s390/include/asm/barrier.h | 24 +++ arch/s390/include/asm/lowcore.h | 4 +- arch/s390/include/asm/nospec-branch.h | 17 ++ arch/s390/include/asm/processor.h | 3 + arch/s390/include/asm/thread_info.h | 4 + arch/s390/kernel/Makefile | 3 + arch/s390/kernel/alternative.c | 26 +--- arch/s390/kernel/entry.S | 213 ++++++++++++++++++++++---- arch/s390/kernel/module.c | 62 ++++++-- arch/s390/kernel/nospec-branch.c | 169 ++++++++++++++++++++ arch/s390/kernel/processor.c | 19 ++- arch/s390/kernel/setup.c | 7 + arch/s390/kernel/smp.c | 1 + arch/s390/kernel/uprobes.c | 9 ++ arch/s390/kernel/vmlinux.lds.S | 14 ++ arch/x86/kernel/tsc.c | 2 +- debian.master/config/config.common.ubuntu | 4 + drivers/cdrom/cdrom.c | 2 +- drivers/input/misc/drv260x.c | 2 +- drivers/message/fusion/mptsas.c | 1 + drivers/net/bonding/bond_main.c | 3 +- drivers/net/ppp/pppoe.c | 4 + drivers/net/team/team.c | 38 ++++- drivers/net/usb/cdc_ether.c | 10 ++ drivers/net/usb/r8152.c | 2 + drivers/net/wireless/ath/ath10k/mac.c | 5 +- drivers/net/wireless/ath/ath9k/hw.c | 4 + drivers/s390/char/Makefile | 2 + drivers/s390/cio/chsc.c | 14 +- drivers/staging/android/ion/ion_system_heap.c | 2 +- fs/cifs/dir.c | 9 +- fs/jbd2/journal.c | 2 +- include/linux/if_vlan.h | 7 +- include/net/llc_conn.h | 1 + kernel/events/core.c | 4 +- net/core/dev.c | 2 +- net/core/neighbour.c | 40 +++-- net/dns_resolver/dns_key.c | 13 +- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_input.c | 7 +- net/ipv6/route.c | 2 + net/l2tp/l2tp_ppp.c | 7 + net/llc/af_llc.c | 14 +- net/llc/llc_c_ac.c | 9 +- net/llc/llc_conn.c | 22 ++- net/packet/af_packet.c | 88 +++++++---- net/packet/internal.h | 10 +- net/sctp/ipv6.c | 60 ++++---- net/tipc/net.c | 3 +- 54 files changed, 856 insertions(+), 227 deletions(-) create mode 100644 arch/s390/include/asm/nospec-branch.h create mode 100644 arch/s390/kernel/nospec-branch.c