commit e46daee53bb5 "ARM: 8806/1: kprobes: Fix false positive with FORTIFY_SOURCE"
introduced a regression in optimized kprobes. It triggers "invalid
instruction" oopses when using kprobes instrumentation through lttng and
perf. This commit was introduced in kernel v4.20, and has been backported
to stable kernels 4.19 and 4.14.
This crash was also reported by Hongzhi Song on the redhat bugzilla
where the patch was originally introduced.
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1639397
Link: https://bugs.lttng.org/issues/1174
Link: https://lore.kernel.org/lkml/342740659.2887.1549307721609.JavaMail.zimbra@e…
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com>
Reported-by: Robert Berger <Robert.Berger(a)ReliableEmbeddedSystems.com>
Tested-by: Robert Berger <Robert.Berger(a)ReliableEmbeddedSystems.com>
CC: Robert Berger <Robert.Berger(a)ReliableEmbeddedSystems.com>
CC: Masami Hiramatsu <mhiramat(a)kernel.org>
CC: William Cohen <wcohen(a)redhat.com>
CC: Laura Abbott <labbott(a)redhat.com>
CC: Kees Cook <keescook(a)chromium.org>
CC: Russell King <rmk+kernel(a)armlinux.org.uk>
CC: <stable(a)vger.kernel.org> # v4.14+
---
arch/arm/probes/kprobes/opt-arm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c
index 2c118a6ab358..0dc23fc227ed 100644
--- a/arch/arm/probes/kprobes/opt-arm.c
+++ b/arch/arm/probes/kprobes/opt-arm.c
@@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or
}
/* Copy arch-dep-instance from template. */
- memcpy(code, (unsigned char *)optprobe_template_entry,
+ memcpy(code, (unsigned long *)&optprobe_template_entry,
TMPL_END_IDX * sizeof(kprobe_opcode_t));
/* Adjust buffer according to instruction. */
--
2.11.0
This is the start of the stable review cycle for the 4.4.173 release.
There are 65 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed Feb 6 10:35:30 UTC 2019.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.173-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.4.173-rc1
Dan Carpenter <dan.carpenter(a)oracle.com>
ipv4: frags: precedence bug in ip_expire()
Taehee Yoo <ap420073(a)gmail.com>
ip: frags: fix crash in ip_do_fragment()
Michal Kubecek <mkubecek(a)suse.cz>
net: ipv4: do not handle duplicate fragments as overlapping
Peter Oskolkov <posk(a)google.com>
ip: process in-order fragments efficiently
Peter Oskolkov <posk(a)google.com>
ip: add helpers to process in-order fragments faster.
Florian Westphal <fw(a)strlen.de>
ipv6: defrag: drop non-last frags smaller than min mtu
Peter Oskolkov <posk(a)google.com>
ip: use rb trees for IP frag queue.
Eric Dumazet <edumazet(a)google.com>
inet: frags: get rif of inet_frag_evicting()
Peter Oskolkov <posk(a)google.com>
net: modify skb_rbtree_purge to return the truesize of all purged skbs.
Peter Oskolkov <posk(a)google.com>
ip: discard IPv4 datagrams with overlapping segments.
Dave Chinner <dchinner(a)redhat.com>
fs: don't scan the inode cache before SB_BORN is set
David Hildenbrand <david(a)redhat.com>
mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
Benjamin Herrenschmidt <benh(a)kernel.crashing.org>
drivers: core: Remove glue dirs from sysfs earlier
Paulo Alcantara <paulo(a)paulo.ac>
cifs: Always resolve hostname before reconnecting
Shakeel Butt <shakeelb(a)google.com>
mm, oom: fix use-after-free in oom_kill_process
Andrei Vagin <avagin(a)gmail.com>
kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
Stefan Wahren <stefan.wahren(a)i2se.com>
mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Revert "Fix loop in gfs2_rbm_find"
James Morse <james.morse(a)arm.com>
arm64: hyp-stub: Forbid kprobing of the hyp-stub
Koen Vandeputte <koen.vandeputte(a)ncentric.com>
ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
Waiman Long <longman(a)redhat.com>
fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Do not count -ENODATA as failure for query directory
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: fix reading optional fields of L2TPv3
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
l2tp: remove l2specific_len dependency in l2tp_core
Mathias Thore <mathias.thore(a)infinera.com>
ucc_geth: Reset BQL queue when stopping device
Bernard Pidoux <f6bvp(a)free.fr>
net/rose: fix NULL ax25_cb kernel panic
Cong Wang <xiyou.wangcong(a)gmail.com>
netrom: switch to sock timer API
Aya Levin <ayal(a)mellanox.com>
net/mlx4_core: Add masking for a few queries on HCA caps
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: copy 4 more bytes to linear part if necessary
David Ahern <dsahern(a)gmail.com>
ipv6: Consider sk_bound_dev_if when binding a socket to an address
Jimmy Durand Wesolowski <jdw(a)amazon.de>
fs: add the fsnotify call to vfs_iter_write
David Hildenbrand <david(a)redhat.com>
s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "loop: Fold __loop_release into loop_release"
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "loop: Get rid of loop_index_mutex"
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()"
Pan Bian <bianpan2016(a)163.com>
f2fs: read page index before freeing
Shaokun Zhang <zhangshaokun(a)hisilicon.com>
arm64: mm: remove page_mapping check in __sync_icache_dcache
Marc Zyngier <marc.zyngier(a)arm.com>
irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size
Milian Wolff <milian.wolff(a)kdab.com>
perf unwind: Take pgoff into account when reporting elf to libdwfl
Martin Vuille <jpmv27(a)aim.com>
perf unwind: Unwind with libdw doesn't take symfs into account
Nicolas Pitre <nicolas.pitre(a)linaro.org>
vt: invoke notifier on screen size change
Oliver Hartkopp <socketcan(a)hartkopp.net>
can: bcm: check timer values before ktime conversion
Manfred Schlaegl <manfred.schlaegl(a)ginzinger.com>
can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
Daniel Drake <drake(a)endlessm.com>
x86/kaslr: Fix incorrect i8254 outb() parameters
Alexander Popov <alex.popov(a)linux.com>
KVM: x86: Fix single-step debugging
Tom Panfil <tom(a)steelseries.com>
Input: xpad - add support for SteelSeries Stratus Duo
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Fix possible hang during async MTU reads and writes
Paul Fulghum <paulkf(a)microgate.com>
tty/n_hdlc: fix __might_sleep warning
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
tty: Handle problem if line discipline does not have receive_buf
Michael Straube <straube.linux(a)gmail.com>
staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
char/mwave: fix potential Spectre v1 vulnerability
Gerald Schaefer <gerald.schaefer(a)de.ibm.com>
s390/smp: fix CPU hotplug deadlock with CPU rescan
Christian Borntraeger <borntraeger(a)de.ibm.com>
s390/early: improve machine detection
Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com>
ARC: perf: map generic branches to correct hardware condition
Kangjie Lu <kjlu(a)umn.edu>
ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
Charles Yeh <charlesyeh522(a)gmail.com>
USB: serial: pl2303: add new PID to support PL2303TB
Max Schulze <max.schulze(a)posteo.de>
USB: serial: simple: add Motorola Tetra TPG2200 device id
Vijay Viswanath <vviswana(a)codeaurora.org>
mmc: Kconfig: Enable CONFIG_MMC_SDHCI_IO_ACCESSORS
Yunjian Wang <wangyunjian(a)huawei.com>
net: bridge: Fix ethernet header pointer before check skb forwardable
Cong Wang <xiyou.wangcong(a)gmail.com>
net_sched: refetch skb protocol for each filter
Ido Schimmel <idosch(a)mellanox.com>
net: ipv4: Fix memory leak in network namespace dismantle
Ross Lagerwall <ross.lagerwall(a)citrix.com>
openvswitch: Avoid OOB read when parsing flow nlattrs
Ross Lagerwall <ross.lagerwall(a)citrix.com>
net: Fix usage of pskb_trim_rcsum
-------------
Diffstat:
Makefile | 4 +-
arch/arc/include/asm/perf_event.h | 3 +-
arch/arm/mach-cns3xxx/pcie.c | 2 +-
arch/arm64/kernel/hyp-stub.S | 2 +
arch/arm64/mm/flush.c | 4 -
arch/s390/kernel/early.c | 4 +-
arch/s390/kernel/setup.c | 2 +
arch/s390/kernel/smp.c | 12 +-
arch/x86/boot/compressed/aslr.c | 4 +-
arch/x86/kvm/x86.c | 3 +-
drivers/base/core.c | 2 +
drivers/block/loop.c | 47 +--
drivers/char/mwave/mwavedd.c | 7 +
drivers/input/joystick/xpad.c | 3 +
drivers/irqchip/irq-gic-v3-its.c | 25 +-
drivers/mmc/host/Kconfig | 1 +
drivers/mmc/host/sdhci-iproc.c | 5 +-
drivers/net/can/dev.c | 27 +-
drivers/net/ethernet/freescale/ucc_geth.c | 2 +
drivers/net/ethernet/mellanox/mlx4/fw.c | 75 +++--
drivers/net/ppp/pppoe.c | 1 +
drivers/platform/x86/asus-nb-wmi.c | 3 +-
drivers/s390/char/sclp_config.c | 2 +
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 +
drivers/tty/n_hdlc.c | 1 +
drivers/tty/tty_io.c | 3 +-
drivers/tty/vt/vt.c | 1 +
drivers/usb/serial/pl2303.c | 1 +
drivers/usb/serial/pl2303.h | 2 +
drivers/usb/serial/usb-serial-simple.c | 3 +-
fs/cifs/connect.c | 53 ++++
fs/cifs/smb2ops.c | 6 +-
fs/cifs/smb2pdu.c | 4 +-
fs/dcache.c | 6 +-
fs/f2fs/node.c | 4 +-
fs/gfs2/rgrp.c | 2 +-
fs/read_write.c | 4 +-
fs/super.c | 30 +-
include/linux/kobject.h | 17 ++
include/linux/skbuff.h | 5 +-
include/net/inet_frag.h | 12 +-
include/net/ip_fib.h | 2 +-
include/uapi/linux/snmp.h | 1 +
kernel/exit.c | 12 +-
mm/migrate.c | 7 +-
mm/oom_kill.c | 8 +
net/bridge/br_forward.c | 7 +-
net/bridge/br_netfilter_ipv6.c | 1 +
net/bridge/netfilter/nft_reject_bridge.c | 1 +
net/can/bcm.c | 27 ++
net/core/skbuff.c | 6 +-
net/ipv4/fib_frontend.c | 4 +-
net/ipv4/fib_trie.c | 14 +-
net/ipv4/inet_fragment.c | 16 +-
net/ipv4/ip_fragment.c | 410 ++++++++++++++++-----------
net/ipv4/ip_input.c | 1 +
net/ipv4/proc.c | 1 +
net/ipv6/af_inet6.c | 3 +
net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +
net/ipv6/reassembly.c | 9 +-
net/l2tp/l2tp_core.c | 43 +--
net/l2tp/l2tp_core.h | 31 ++
net/l2tp/l2tp_ip.c | 3 +
net/l2tp/l2tp_ip6.c | 3 +
net/netrom/nr_timer.c | 20 +-
net/openvswitch/flow_netlink.c | 2 +-
net/rose/rose_route.c | 5 +
net/sched/sch_api.c | 3 +-
sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +-
tools/perf/util/unwind-libdw.c | 4 +-
70 files changed, 706 insertions(+), 347 deletions(-)
From: "Gustavo A. R. Silva" <gustavo(a)embeddedor.com>
Notice that the use of the bitwise OR operator '|' always leads to true
in this particular case, which seems a bit suspicious due to the context
in which this expression is being used.
Fix this by using bitwise AND operator '&' instead.
This bug was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com>
Acked-by: Jiri Olsa <jolsa(a)kernel.org>
Cc: Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
Cc: Namhyung Kim <namhyung(a)kernel.org>
Cc: Peter Zijlstra <peterz(a)infradead.org>
Cc: stable(a)vger.kernel.org
Fixes: 6a6cd11d4e57 ("perf test: Add test for the sched tracepoint format fields")
Link: http://lkml.kernel.org/r/20190122233439.GA5868@embeddedor
Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com>
---
tools/perf/tests/evsel-tp-sched.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-sched.c
index 5f8501c68da4..5cbba70bcdd0 100644
--- a/tools/perf/tests/evsel-tp-sched.c
+++ b/tools/perf/tests/evsel-tp-sched.c
@@ -17,7 +17,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
return -1;
}
- is_signed = !!(field->flags | TEP_FIELD_IS_SIGNED);
+ is_signed = !!(field->flags & TEP_FIELD_IS_SIGNED);
if (should_be_signed && !is_signed) {
pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n",
evsel->name, name, is_signed, should_be_signed);
--
2.20.1
This is the start of the stable review cycle for the 4.20.7 release.
There are 80 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed Feb 6 10:35:33 UTC 2019.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.20.7-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.20.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.20.7-rc1
Paulo Alcantara <paulo(a)paulo.ac>
cifs: Always resolve hostname before reconnecting
Alexei Naberezhnov <anaberezhnov(a)fb.com>
md/raid5: fix 'out of memory' during raid cache recovery
Frank Rowand <frank.rowand(a)sony.com>
of: overlay: do not duplicate properties from overlay for new nodes
Frank Rowand <frank.rowand(a)sony.com>
of: overlay: use prop add changeset entry for property in new nodes
Frank Rowand <frank.rowand(a)sony.com>
of: overlay: add missing of_node_get() in __of_attach_node_sysfs
Frank Rowand <frank.rowand(a)sony.com>
of: overlay: add tests to validate kfrees from overlay removal
David Hildenbrand <david(a)redhat.com>
mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
mm: hwpoison: use do_send_sig_info() instead of force_sig()
Shakeel Butt <shakeelb(a)google.com>
mm, oom: fix use-after-free in oom_kill_process
Oscar Salvador <osalvador(a)suse.de>
mm,memory_hotplug: fix scan_movable_pages() for gigantic hugepages
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
oom, oom_reaper: do not enqueue same task twice
Andrea Arcangeli <aarcange(a)redhat.com>
mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
Andrei Vagin <avagin(a)gmail.com>
kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
Eric W. Biederman <ebiederm(a)xmission.com>
btrfs: On error always free subvol_name in btrfs_mount
Filipe Manana <fdmanana(a)suse.com>
Btrfs: fix deadlock when allocating tree block during leaf/node split
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
Mike Marciniszyn <mike.marciniszyn(a)intel.com>
IB/hfi1: Add limit test for RC/UC send via loopback
Michael J. Ruhl <michael.j.ruhl(a)intel.com>
IB/hfi1: Remove overly conservative VM_EXEC flag check
Yishai Hadas <yishaih(a)mellanox.com>
IB/uverbs: Fix OOPs in uverbs_user_mmap_disassociate
Yishai Hadas <yishaih(a)mellanox.com>
IB/uverbs: Fix OOPs upon device disassociation
Takashi Iwai <tiwai(a)suse.de>
ALSA: pcm: Fix tight loop of OSS capture stream
Kailang Yang <kailang(a)realtek.com>
ALSA: hda/realtek - Fixed hp_pin no value
Olek Poplavsky <woodenbits(a)gmail.com>
ALSA: usb-audio: Add Opus #3 to quirks for native DSD support
Chaotian Jing <chaotian.jing(a)mediatek.com>
mmc: mediatek: fix incorrect register setting of hs400_cmd_int_delay
Lukas Wunner <lukas(a)wunner.de>
mmc: bcm2835: Fix DMA channel leak on probe error
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Revert "Fix loop in gfs2_rbm_find"
Neo Hou <neo.hou(a)unisoc.com>
gpio: sprd: Fix incorrect irq type setting for the async EIC
Neo Hou <neo.hou(a)unisoc.com>
gpio: sprd: Fix the incorrect data register
Roger Quadros <rogerq(a)ti.com>
gpio: pcf857x: Fix interrupts on multiple instances
Bartosz Golaszewski <bgolaszewski(a)baylibre.com>
gpiolib: fix line event timestamps for nested irqs
Axel Lin <axel.lin(a)ingics.com>
gpio: altera-a10sr: Set proper output level for direction_output
James Morse <james.morse(a)arm.com>
arm64: hibernate: Clean the __hyp_text to PoC after resume
James Morse <james.morse(a)arm.com>
arm64: hyp-stub: Forbid kprobing of the hyp-stub
Catalin Marinas <catalin.marinas(a)arm.com>
arm64: Do not issue IPIs for user executable ptes
Ard Biesheuvel <ard.biesheuvel(a)linaro.org>
arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
Koen Vandeputte <koen.vandeputte(a)ncentric.com>
ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
Trond Myklebust <trondmy(a)gmail.com>
NFS: Fix up return value on fatal errors in nfs_page_async_flush()
Kees Cook <keescook(a)chromium.org>
selftests/seccomp: Enhance per-arch ptrace syscall skip tests
Gerald Schaefer <gerald.schaefer(a)de.ibm.com>
iommu/vt-d: Fix memory leak in intel_iommu_put_resv_regions()
Waiman Long <longman(a)redhat.com>
fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Do not consider -ENODATA as stat failure for reads
Aurelien Aptel <aaptel(a)suse.com>
CIFS: fix use-after-free of the lease keys
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Fix trace command logging for SMB2 reads and writes
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Fix possible oops and memory leaks in async IO
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Do not count -ENODATA as failure for query directory
David Ahern <dsahern(a)gmail.com>
ipv6: Consider sk_bound_dev_if when binding a socket to an address
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Differentiate sk_buff and xdp_frame on freeing
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Use xdp_return_frame to free xdp_frames on destroying vqs
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Don't process redirected XDP frames when XDP is disabled
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Fix out of bounds access of sq
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Fix not restoring real_num_rx_queues
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Don't call free_old_xmit_skbs for xdp_frames
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Don't enable NAPI when interface is down
Dave Watson <davejwatson(a)fb.com>
net: tls: Save iv in tls_rec for async crypto requests
Dave Watson <davejwatson(a)fb.com>
net: tls: Fix deadlock in free_resources tx
Xin Long <lucien.xin(a)gmail.com>
sctp: set flow sport from saddr only when it's 0
Xin Long <lucien.xin(a)gmail.com>
sctp: set chunk transport correctly when it's a new asoc
Bodong Wang <bodong(a)mellanox.com>
Revert "net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager"
Nir Dotan <nird(a)mellanox.com>
ip6mr: Fix notifiers call on mroute_clean_tables()
Aya Levin <ayal(a)mellanox.com>
net/mlx5e: Allow MAC invalidation while spoofchk is ON
Xin Long <lucien.xin(a)gmail.com>
sctp: improve the events for sctp stream adding
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
net: ip6_gre: always reports o_key to userspace
Jason Wang <jasowang(a)redhat.com>
vhost: fix OOB in get_rx_bufs()
Mathias Thore <mathias.thore(a)infinera.com>
ucc_geth: Reset BQL queue when stopping device
George Amanakis <gamanakis(a)gmail.com>
tun: move the call to tun_set_real_num_queues
Xin Long <lucien.xin(a)gmail.com>
sctp: improve the events for sctp stream reset
Simon Horman <horms+renesas(a)verge.net.au>
ravb: expand rx descriptor data to accommodate hw checksum
Josh Elsasser <jelsasser(a)appneta.com>
net: set default network namespace in init_dummy_netdev()
Bernard Pidoux <f6bvp(a)free.fr>
net/rose: fix NULL ax25_cb kernel panic
Cong Wang <xiyou.wangcong(a)gmail.com>
netrom: switch to sock timer API
Aya Levin <ayal(a)mellanox.com>
net/mlx4_core: Add masking for a few queries on HCA caps
Jakub Kicinski <jakub.kicinski(a)netronome.com>
net/ipv6: don't return positive numbers when nothing was dumped
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
net: ip_gre: use erspan key field for tunnel lookup
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
net: ip_gre: always reports o_key to userspace
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: fix reading optional fields of L2TPv3
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: copy 4 more bytes to linear part if necessary
Daniel Borkmann <daniel(a)iogearbox.net>
ipvlan, l3mdev: fix broken l3s mode wrt local routes
Yohei Kanemaru <yohei.kanemaru(a)gmail.com>
ipv6: sr: clear IP6CB(skb) on SRH ip4ip6 encapsulation
Arnd Bergmann <arnd(a)arndb.de>
drm/msm/gpu: fix building without debugfs
-------------
Diffstat:
Makefile | 4 +-
arch/arm/mach-cns3xxx/pcie.c | 2 +-
arch/arm64/kernel/hibernate.c | 4 +-
arch/arm64/kernel/hyp-stub.S | 2 +
arch/arm64/kernel/kaslr.c | 1 +
arch/arm64/mm/flush.c | 6 +-
drivers/gpio/gpio-altera-a10sr.c | 4 +-
drivers/gpio/gpio-eic-sprd.c | 14 +-
drivers/gpio/gpio-pcf857x.c | 26 ++--
drivers/gpio/gpiolib.c | 9 +-
drivers/gpu/drm/msm/msm_gpu.h | 2 +-
drivers/infiniband/core/uverbs_main.c | 25 ++--
drivers/infiniband/hw/hfi1/file_ops.c | 2 +-
drivers/infiniband/sw/rdmavt/qp.c | 7 +-
drivers/iommu/intel-iommu.c | 2 +-
drivers/md/raid5-cache.c | 33 +++--
drivers/md/raid5.c | 8 +-
drivers/mmc/host/bcm2835.c | 2 +
drivers/mmc/host/mtk-sd.c | 2 +-
drivers/net/ethernet/freescale/ucc_geth.c | 2 +
drivers/net/ethernet/mellanox/mlx4/fw.c | 75 ++++++----
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +--
drivers/net/ethernet/renesas/ravb_main.c | 12 +-
drivers/net/ipvlan/ipvlan_main.c | 6 +-
drivers/net/tun.c | 3 +-
drivers/net/virtio_net.c | 169 +++++++++++++++-------
drivers/of/dynamic.c | 32 +++-
drivers/of/kobj.c | 4 +-
drivers/of/overlay.c | 115 ++++++++++-----
drivers/platform/x86/asus-nb-wmi.c | 3 +-
drivers/vhost/net.c | 3 +-
drivers/vhost/scsi.c | 2 +-
drivers/vhost/vhost.c | 7 +-
drivers/vhost/vhost.h | 4 +-
drivers/vhost/vsock.c | 2 +-
fs/btrfs/ctree.c | 78 ++++++----
fs/btrfs/super.c | 3 +
fs/cifs/connect.c | 53 +++++++
fs/cifs/file.c | 11 +-
fs/cifs/smb2pdu.c | 54 ++++---
fs/dcache.c | 6 +-
fs/gfs2/rgrp.c | 2 +-
fs/nfs/write.c | 9 +-
include/linux/netdevice.h | 8 +
include/linux/of.h | 15 +-
include/linux/sched/coredump.h | 1 +
include/net/l3mdev.h | 3 +-
include/net/tls.h | 2 +
kernel/exit.c | 12 +-
mm/hugetlb.c | 3 +-
mm/memory-failure.c | 3 +-
mm/memory_hotplug.c | 36 +++--
mm/migrate.c | 7 +-
mm/oom_kill.c | 12 +-
net/core/dev.c | 3 +
net/ipv4/gre_demux.c | 17 +++
net/ipv4/ip_gre.c | 16 +-
net/ipv6/addrconf.c | 2 +
net/ipv6/af_inet6.c | 3 +
net/ipv6/ip6_gre.c | 11 +-
net/ipv6/ip6mr.c | 7 +-
net/ipv6/seg6_iptunnel.c | 2 +
net/l2tp/l2tp_core.c | 9 +-
net/l2tp/l2tp_core.h | 20 +++
net/l2tp/l2tp_ip.c | 3 +
net/l2tp/l2tp_ip6.c | 3 +
net/netrom/nr_timer.c | 20 +--
net/rose/rose_route.c | 5 +
net/sctp/ipv6.c | 3 +-
net/sctp/protocol.c | 3 +-
net/sctp/sm_make_chunk.c | 11 +-
net/sctp/stream.c | 58 ++++----
net/tls/tls_sw.c | 6 +-
sound/core/pcm_lib.c | 9 +-
sound/pci/hda/patch_realtek.c | 78 +++++-----
sound/usb/quirks.c | 1 +
tools/testing/selftests/seccomp/seccomp_bpf.c | 72 +++++++--
77 files changed, 879 insertions(+), 417 deletions(-)
This is the start of the stable review cycle for the 4.14.98 release.
There are 46 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed Feb 6 10:35:31 UTC 2019.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.98-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.14.98-rc1
Amir Goldstein <amir73il(a)gmail.com>
fanotify: fix handling of events on child sub-directory
Benjamin Herrenschmidt <benh(a)kernel.crashing.org>
drivers: core: Remove glue dirs from sysfs earlier
Paulo Alcantara <paulo(a)paulo.ac>
cifs: Always resolve hostname before reconnecting
Alexei Naberezhnov <anaberezhnov(a)fb.com>
md/raid5: fix 'out of memory' during raid cache recovery
David Hildenbrand <david(a)redhat.com>
mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
mm: hwpoison: use do_send_sig_info() instead of force_sig()
Shakeel Butt <shakeelb(a)google.com>
mm, oom: fix use-after-free in oom_kill_process
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
oom, oom_reaper: do not enqueue same task twice
Andrei Vagin <avagin(a)gmail.com>
kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
Stefan Wahren <stefan.wahren(a)i2se.com>
mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
Michael J. Ruhl <michael.j.ruhl(a)intel.com>
IB/hfi1: Remove overly conservative VM_EXEC flag check
Kailang Yang <kailang(a)realtek.com>
ALSA: hda/realtek - Fixed hp_pin no value
Lukas Wunner <lukas(a)wunner.de>
mmc: bcm2835: Fix DMA channel leak on probe error
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Revert "Fix loop in gfs2_rbm_find"
Roger Quadros <rogerq(a)ti.com>
gpio: pcf857x: Fix interrupts on multiple instances
Axel Lin <axel.lin(a)ingics.com>
gpio: altera-a10sr: Set proper output level for direction_output
James Morse <james.morse(a)arm.com>
arm64: hibernate: Clean the __hyp_text to PoC after resume
James Morse <james.morse(a)arm.com>
arm64: hyp-stub: Forbid kprobing of the hyp-stub
Ard Biesheuvel <ard.biesheuvel(a)linaro.org>
arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
Koen Vandeputte <koen.vandeputte(a)ncentric.com>
ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
Trond Myklebust <trondmy(a)gmail.com>
NFS: Fix up return value on fatal errors in nfs_page_async_flush()
Kees Cook <keescook(a)chromium.org>
selftests/seccomp: Enhance per-arch ptrace syscall skip tests
Gerald Schaefer <gerald.schaefer(a)de.ibm.com>
iommu/vt-d: Fix memory leak in intel_iommu_put_resv_regions()
Waiman Long <longman(a)redhat.com>
fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Do not count -ENODATA as failure for query directory
Daniel Borkmann <daniel(a)iogearbox.net>
ipvlan, l3mdev: fix broken l3s mode wrt local routes
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: fix reading optional fields of L2TPv3
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
l2tp: remove l2specific_len dependency in l2tp_core
Xin Long <lucien.xin(a)gmail.com>
sctp: improve the events for sctp stream reset
Xin Long <lucien.xin(a)gmail.com>
sctp: improve the events for sctp stream adding
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Fix not restoring real_num_rx_queues
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Don't call free_old_xmit_skbs for xdp_frames
Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp>
virtio_net: Don't enable NAPI when interface is down
Bodong Wang <bodong(a)mellanox.com>
Revert "net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager"
Aya Levin <ayal(a)mellanox.com>
net/mlx5e: Allow MAC invalidation while spoofchk is ON
Mathias Thore <mathias.thore(a)infinera.com>
ucc_geth: Reset BQL queue when stopping device
Josh Elsasser <jelsasser(a)appneta.com>
net: set default network namespace in init_dummy_netdev()
Bernard Pidoux <f6bvp(a)free.fr>
net/rose: fix NULL ax25_cb kernel panic
Cong Wang <xiyou.wangcong(a)gmail.com>
netrom: switch to sock timer API
Aya Levin <ayal(a)mellanox.com>
net/mlx4_core: Add masking for a few queries on HCA caps
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: copy 4 more bytes to linear part if necessary
Yohei Kanemaru <yohei.kanemaru(a)gmail.com>
ipv6: sr: clear IP6CB(skb) on SRH ip4ip6 encapsulation
David Ahern <dsahern(a)gmail.com>
ipv6: Consider sk_bound_dev_if when binding a socket to an address
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Fix "net: ipv4: do not handle duplicate fragments as overlapping"
-------------
Diffstat:
Makefile | 4 +-
arch/arm/mach-cns3xxx/pcie.c | 2 +-
arch/arm64/kernel/hibernate.c | 4 +-
arch/arm64/kernel/hyp-stub.S | 2 +
arch/arm64/kernel/kaslr.c | 1 +
drivers/base/core.c | 2 +
drivers/gpio/gpio-altera-a10sr.c | 4 +-
drivers/gpio/gpio-pcf857x.c | 26 ++++----
drivers/infiniband/hw/hfi1/file_ops.c | 2 +-
drivers/iommu/intel-iommu.c | 2 +-
drivers/md/raid5-cache.c | 33 ++++++----
drivers/md/raid5.c | 8 ++-
drivers/mmc/host/bcm2835.c | 2 +
drivers/mmc/host/sdhci-iproc.c | 5 +-
drivers/net/ethernet/freescale/ucc_geth.c | 2 +
drivers/net/ethernet/mellanox/mlx4/fw.c | 75 +++++++++++++---------
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +++----
drivers/net/ipvlan/ipvlan_main.c | 6 +-
drivers/net/virtio_net.c | 55 ++++++++++------
drivers/platform/x86/asus-nb-wmi.c | 3 +-
fs/cifs/connect.c | 53 +++++++++++++++
fs/cifs/smb2pdu.c | 4 +-
fs/dcache.c | 6 +-
fs/gfs2/rgrp.c | 2 +-
fs/nfs/write.c | 9 +--
fs/notify/fsnotify.c | 8 ++-
include/linux/kobject.h | 17 +++++
include/linux/netdevice.h | 8 +++
include/linux/sched/coredump.h | 1 +
include/net/l3mdev.h | 3 +-
kernel/exit.c | 12 +++-
mm/memory-failure.c | 3 +-
mm/migrate.c | 7 +-
mm/oom_kill.c | 12 +++-
net/core/dev.c | 3 +
net/ipv4/ip_fragment.c | 2 +-
net/ipv6/af_inet6.c | 3 +
net/ipv6/seg6_iptunnel.c | 2 +
net/l2tp/l2tp_core.c | 43 +++++++------
net/l2tp/l2tp_core.h | 31 +++++++++
net/l2tp/l2tp_ip.c | 3 +
net/l2tp/l2tp_ip6.c | 3 +
net/netrom/nr_timer.c | 20 +++---
net/rose/rose_route.c | 5 ++
net/sctp/stream.c | 62 ++++++++----------
sound/pci/hda/patch_realtek.c | 78 +++++++++++++----------
tools/testing/selftests/seccomp/seccomp_bpf.c | 72 ++++++++++++++++-----
47 files changed, 494 insertions(+), 238 deletions(-)
This is the start of the stable review cycle for the 3.18.134 release.
There are 31 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed Feb 6 10:35:28 UTC 2019.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v3.x/stable-review/patch-3.18.134-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-3.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 3.18.134-rc1
David Hildenbrand <david(a)redhat.com>
mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
Shakeel Butt <shakeelb(a)google.com>
mm, oom: fix use-after-free in oom_kill_process
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Revert "Fix loop in gfs2_rbm_find"
James Morse <james.morse(a)arm.com>
arm64: hyp-stub: Forbid kprobing of the hyp-stub
Waiman Long <longman(a)redhat.com>
fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Do not count -ENODATA as failure for query directory
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: fix reading optional fields of L2TPv3
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
l2tp: remove l2specific_len dependency in l2tp_core
Mathias Thore <mathias.thore(a)infinera.com>
ucc_geth: Reset BQL queue when stopping device
Bernard Pidoux <f6bvp(a)free.fr>
net/rose: fix NULL ax25_cb kernel panic
Cong Wang <xiyou.wangcong(a)gmail.com>
netrom: switch to sock timer API
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: copy 4 more bytes to linear part if necessary
David Ahern <dsahern(a)gmail.com>
ipv6: Consider sk_bound_dev_if when binding a socket to an address
Pan Bian <bianpan2016(a)163.com>
f2fs: read page index before freeing
Milian Wolff <milian.wolff(a)kdab.com>
perf unwind: Take pgoff into account when reporting elf to libdwfl
Martin Vuille <jpmv27(a)aim.com>
perf unwind: Unwind with libdw doesn't take symfs into account
Nicolas Pitre <nicolas.pitre(a)linaro.org>
vt: invoke notifier on screen size change
Oliver Hartkopp <socketcan(a)hartkopp.net>
can: bcm: check timer values before ktime conversion
Manfred Schlaegl <manfred.schlaegl(a)ginzinger.com>
can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
Daniel Drake <drake(a)endlessm.com>
x86/kaslr: Fix incorrect i8254 outb() parameters
Tom Panfil <tom(a)steelseries.com>
Input: xpad - add support for SteelSeries Stratus Duo
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Fix possible hang during async MTU reads and writes
Paul Fulghum <paulkf(a)microgate.com>
tty/n_hdlc: fix __might_sleep warning
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
tty: Handle problem if line discipline does not have receive_buf
Michael Straube <straube.linux(a)gmail.com>
staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
Gerald Schaefer <gerald.schaefer(a)de.ibm.com>
s390/smp: fix CPU hotplug deadlock with CPU rescan
Charles Yeh <charlesyeh522(a)gmail.com>
USB: serial: pl2303: add new PID to support PL2303TB
Max Schulze <max.schulze(a)posteo.de>
USB: serial: simple: add Motorola Tetra TPG2200 device id
Ross Lagerwall <ross.lagerwall(a)citrix.com>
openvswitch: Avoid OOB read when parsing flow nlattrs
-------------
Diffstat:
Makefile | 4 +--
arch/arm64/kernel/hyp-stub.S | 2 ++
arch/s390/kernel/smp.c | 4 +++
arch/x86/boot/compressed/aslr.c | 4 +--
drivers/input/joystick/xpad.c | 3 ++
drivers/net/can/dev.c | 27 +++++++++---------
drivers/net/ethernet/freescale/ucc_geth.c | 2 ++
drivers/platform/x86/asus-nb-wmi.c | 3 +-
drivers/s390/char/sclp_config.c | 2 ++
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 +
drivers/tty/n_hdlc.c | 1 +
drivers/tty/tty_io.c | 3 +-
drivers/tty/vt/vt.c | 1 +
drivers/usb/serial/pl2303.c | 1 +
drivers/usb/serial/pl2303.h | 2 ++
drivers/usb/serial/usb-serial-simple.c | 3 +-
fs/cifs/smb2ops.c | 6 ++--
fs/cifs/smb2pdu.c | 4 +--
fs/dcache.c | 6 +---
fs/f2fs/node.c | 4 ++-
fs/gfs2/rgrp.c | 2 +-
mm/migrate.c | 7 +++--
mm/oom_kill.c | 8 ++++++
net/can/bcm.c | 27 ++++++++++++++++++
net/ipv6/af_inet6.c | 3 ++
net/l2tp/l2tp_core.c | 43 +++++++++++++++--------------
net/l2tp/l2tp_core.h | 31 +++++++++++++++++++++
net/l2tp/l2tp_ip.c | 3 ++
net/l2tp/l2tp_ip6.c | 3 ++
net/netrom/nr_timer.c | 20 +++++++-------
net/openvswitch/flow_netlink.c | 2 +-
net/rose/rose_route.c | 5 ++++
tools/perf/util/unwind-libdw.c | 4 +--
33 files changed, 171 insertions(+), 70 deletions(-)
I've backported fixes for several security issues involving filesystem
validation in f2fs. All of these are already fixed in the later stable
branches.
I tested with the reproducers where available. I also checked for
regressions with xfstests and didn't find any (but many tests fail with
or without these changes).
Ben.
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
This is the start of the stable review cycle for the 4.9.155 release.
There are 30 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed Feb 6 10:35:37 UTC 2019.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.155-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.9.155-rc1
Amir Goldstein <amir73il(a)gmail.com>
fanotify: fix handling of events on child sub-directory
Dave Chinner <dchinner(a)redhat.com>
fs: don't scan the inode cache before SB_BORN is set
Benjamin Herrenschmidt <benh(a)kernel.crashing.org>
drivers: core: Remove glue dirs from sysfs earlier
Paulo Alcantara <paulo(a)paulo.ac>
cifs: Always resolve hostname before reconnecting
David Hildenbrand <david(a)redhat.com>
mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
mm: hwpoison: use do_send_sig_info() instead of force_sig()
Shakeel Butt <shakeelb(a)google.com>
mm, oom: fix use-after-free in oom_kill_process
Andrei Vagin <avagin(a)gmail.com>
kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
Stefan Wahren <stefan.wahren(a)i2se.com>
mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
João Paulo Rechi Vita <jprvita(a)gmail.com>
platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Revert "Fix loop in gfs2_rbm_find"
James Morse <james.morse(a)arm.com>
arm64: hibernate: Clean the __hyp_text to PoC after resume
James Morse <james.morse(a)arm.com>
arm64: hyp-stub: Forbid kprobing of the hyp-stub
Ard Biesheuvel <ard.biesheuvel(a)linaro.org>
arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
Koen Vandeputte <koen.vandeputte(a)ncentric.com>
ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
Waiman Long <longman(a)redhat.com>
fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
Pavel Shilovsky <pshilov(a)microsoft.com>
CIFS: Do not count -ENODATA as failure for query directory
Daniel Borkmann <daniel(a)iogearbox.net>
ipvlan, l3mdev: fix broken l3s mode wrt local routes
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: fix reading optional fields of L2TPv3
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
l2tp: remove l2specific_len dependency in l2tp_core
Aya Levin <ayal(a)mellanox.com>
net/mlx5e: Allow MAC invalidation while spoofchk is ON
Mathias Thore <mathias.thore(a)infinera.com>
ucc_geth: Reset BQL queue when stopping device
Bernard Pidoux <f6bvp(a)free.fr>
net/rose: fix NULL ax25_cb kernel panic
Cong Wang <xiyou.wangcong(a)gmail.com>
netrom: switch to sock timer API
Aya Levin <ayal(a)mellanox.com>
net/mlx4_core: Add masking for a few queries on HCA caps
Jacob Wen <jian.w.wen(a)oracle.com>
l2tp: copy 4 more bytes to linear part if necessary
David Ahern <dsahern(a)gmail.com>
ipv6: Consider sk_bound_dev_if when binding a socket to an address
Jimmy Durand Wesolowski <jdw(a)amazon.de>
fs: add the fsnotify call to vfs_iter_write
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Fix "net: ipv4: do not handle duplicate fragments as overlapping"
-------------
Diffstat:
Makefile | 4 +-
arch/arm/mach-cns3xxx/pcie.c | 2 +-
arch/arm64/kernel/hibernate.c | 4 +-
arch/arm64/kernel/hyp-stub.S | 2 +
arch/arm64/kernel/kaslr.c | 1 +
drivers/base/core.c | 2 +
drivers/mmc/host/sdhci-iproc.c | 5 +-
drivers/net/ethernet/freescale/ucc_geth.c | 2 +
drivers/net/ethernet/mellanox/mlx4/fw.c | 75 ++++++++++++++---------
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 19 ++----
drivers/net/ipvlan/ipvlan_main.c | 6 +-
drivers/platform/x86/asus-nb-wmi.c | 3 +-
fs/cifs/connect.c | 53 ++++++++++++++++
fs/cifs/smb2pdu.c | 4 +-
fs/dcache.c | 6 +-
fs/gfs2/rgrp.c | 2 +-
fs/notify/fsnotify.c | 8 ++-
fs/read_write.c | 4 +-
fs/super.c | 30 +++++++--
include/linux/kobject.h | 17 +++++
include/linux/netdevice.h | 8 +++
include/net/l3mdev.h | 3 +-
kernel/exit.c | 12 +++-
mm/memory-failure.c | 3 +-
mm/migrate.c | 7 ++-
mm/oom_kill.c | 8 +++
net/ipv4/ip_fragment.c | 2 +-
net/ipv6/af_inet6.c | 3 +
net/l2tp/l2tp_core.c | 43 ++++++-------
net/l2tp/l2tp_core.h | 31 ++++++++++
net/l2tp/l2tp_ip.c | 3 +
net/l2tp/l2tp_ip6.c | 3 +
net/netrom/nr_timer.c | 20 +++---
net/rose/rose_route.c | 5 ++
34 files changed, 293 insertions(+), 107 deletions(-)
When binding an SCM volume to a physical address the hypervisor has the
option to return early with a continue token with the expectation that
the guest will resume the bind operation until it completes. A quirk of
this interface is that the bind address will only be returned by the
first bind h-call and the subsequent calls will return
0xFFFF_FFFF_FFFF_FFFF for the bind address.
We currently do not save the address returned by the first h-call. As a
result we will use the junk address as the base of the bound region if
the hypervisor decides to split the bind across multiple h-calls. This
bug was found when testing with very large SCM volumes where the bind
process would take more time than they hypervisor's internal h-call time
limit would allow. This patch fixes the issue by saving the bind address
from the first call.
Cc: stable(a)vger.kernel.org
Fixes: b5beae5e224f ("powerpc/pseries: Add driver for PAPR SCM regions")
Signed-off-by: Oliver O'Halloran <oohall(a)gmail.com>
---
arch/powerpc/platforms/pseries/papr_scm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c
index 7d6457ab5d34..bba281b1fe1b 100644
--- a/arch/powerpc/platforms/pseries/papr_scm.c
+++ b/arch/powerpc/platforms/pseries/papr_scm.c
@@ -43,6 +43,7 @@ static int drc_pmem_bind(struct papr_scm_priv *p)
{
unsigned long ret[PLPAR_HCALL_BUFSIZE];
uint64_t rc, token;
+ uint64_t saved = 0;
/*
* When the hypervisor cannot map all the requested memory in a single
@@ -56,6 +57,8 @@ static int drc_pmem_bind(struct papr_scm_priv *p)
rc = plpar_hcall(H_SCM_BIND_MEM, ret, p->drc_index, 0,
p->blocks, BIND_ANY_ADDR, token);
token = ret[0];
+ if (!saved)
+ saved = ret[1];
cond_resched();
} while (rc == H_BUSY);
@@ -64,7 +67,7 @@ static int drc_pmem_bind(struct papr_scm_priv *p)
return -ENXIO;
}
- p->bound_addr = ret[1];
+ p->bound_addr = saved;
dev_dbg(&p->pdev->dev, "bound drc %x to %pR\n", p->drc_index, &p->res);
--
2.20.1
The current approach to read first 6 bytes from the response and then tail
of the response, can cause the 2nd memcpy_fromio() to do an unaligned read
(e.g. read 32-bit word from address aligned to a 16-bits), depending on how
memcpy_fromio() is implemented. If this happens, the read will fail and the
memory controller will fill the read with 1's.
This was triggered by 170d13ca3a2f, which should be probably refined to
check and react to the address alignment. Before that commit, on x86
memcpy_fromio() turned out to be memcpy(). By a luck GCC has done the right
thing (from tpm_crb's perspective) for us so far, but we should not rely on
that. Thus, it makes sense to fix this also in tpm_crb, not least because
the fix can be then backported to stable kernels and make them more robust
when compiled in differing environments.
Cc: stable(a)vger.kernel.org
Cc: Linus Torvalds <torvalds(a)linux-foundation.org>
Cc: James Morris <jmorris(a)namei.org>
Cc: Tomas Winkler <tomas.winkler(a)intel.com>
Cc: Jerry Snitselaar <jsnitsel(a)redhat.com>
Fixes: 30fc8d138e91 ("tpm: TPM 2.0 CRB Interface")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com>
---
drivers/char/tpm/tpm_crb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 36952ef98f90..7f47e43aa9f1 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -288,18 +288,18 @@ static int crb_recv(struct tpm_chip *chip, u8 *buf, size_t count)
unsigned int expected;
/* sanity check */
- if (count < 6)
+ if (count < 8)
return -EIO;
if (ioread32(&priv->regs_t->ctrl_sts) & CRB_CTRL_STS_ERROR)
return -EIO;
- memcpy_fromio(buf, priv->rsp, 6);
+ memcpy_fromio(buf, priv->rsp, 8);
expected = be32_to_cpup((__be32 *) &buf[2]);
- if (expected > count || expected < 6)
+ if (expected > count || expected < 8)
return -EIO;
- memcpy_fromio(&buf[6], &priv->rsp[6], expected - 6);
+ memcpy_fromio(&buf[8], &priv->rsp[8], expected - 8);
return expected;
}
--
2.17.1