4.15.6-stable review
Greg Kroah-Hartman
maintainercover 4.15.6-stable review
This is the start of the stable review cycle for the 4.15.6 release. There are 45 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 Sun Feb 25 17:06:43 UTC 2018. 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.15.6-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.15.6-rc1
Michal Hocko <[email protected]>
vmalloc: fix __GFP_HIGHMEM usage for vmalloc_32 on 32b systems
Tomas Winkler <[email protected]>
mei: me: add cannon point device ids for 4th device
Alexander Usyskin <[email protected]>
mei: me: add cannon point device ids
Kamil Konieczny <[email protected]>
crypto: s5p-sss - Fix kernel Oops in AES-ECB mode
Shuah Khan <[email protected]>
usbip: keep usbip_device sockfd state in sync with tcp_socket
Zhengjun Xing <[email protected]>
xhci: fix xhci debugfs errors in xhci_stop
Zhengjun Xing <[email protected]>
xhci: xhci debugfs device nodes weren't removed after device plugged out
Zhengjun Xing <[email protected]>
xhci: Fix xhci debugfs devices node disappearance after hibernation
Zhengjun Xing <[email protected]>
xhci: Fix NULL pointer in xhci debugfs
Alexandru Ardelean <[email protected]>
staging: iio: ad5933: switch buffer mode to software
Alexandru Ardelean <[email protected]>
staging: iio: adc: ad7192: fix external frequency setting
Arnd Bergmann <[email protected]>
staging: fsl-mc: fix build testing on x86
Todd Kjos <[email protected]>
binder: replace "%p" with "%pK"
Eric Biggers <[email protected]>
binder: check for binder_thread allocation failure in binder_poll()
Ben Hutchings <[email protected]>
staging: android: ashmem: Fix a race condition in pin ioctls
Martijn Coenen <[email protected]>
ANDROID: binder: synchronize_rcu() when using POLLFREE.
Todd Kjos <[email protected]>
ANDROID: binder: remove WARN() for redundant txn error
Paolo Abeni <[email protected]>
dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock
Arnd Bergmann <[email protected]>
arm64: dts: add #cooling-cells to CPU nodes
Arnd Bergmann <[email protected]>
ARM: 8743/1: bL_switcher: add MODULE_LICENSE tag
Arnd Bergmann <[email protected]>
video: fbdev/mmp: add MODULE_LICENSE
Arnd Bergmann <[email protected]>
ASoC: ux500: add MODULE_LICENSE tag
Jesse Chan <[email protected]>
soc: qcom: rmtfs_mem: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
Eric Dumazet <[email protected]>
net_sched: gen_estimator: fix lockdep splat
Willem de Bruijn <[email protected]>
net: avoid skb_warn_bad_offload on IS_ERR
Sowmini Varadhan <[email protected]>
rds: tcp: atomically purge entries from rds_tcp_conn_list during netns delete
Sowmini Varadhan <[email protected]>
rds: tcp: correctly sequence cleanup on netns deletion.
Cong Wang <[email protected]>
netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert
Cong Wang <[email protected]>
netfilter: xt_cgroup: initialize info->priv in cgroup_mt_check_v1()
Paolo Abeni <[email protected]>
netfilter: on sockopt() acquire sock lock only in the required scope
Dmitry Vyukov <[email protected]>
netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check()
Eric Dumazet <[email protected]>
netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target}Dmitry Vyukov <[email protected]>
netfilter: x_tables: fix int overflow in xt_alloc_table_info()
Dmitry Vyukov <[email protected]>
kcov: detect double association with a single task
Wanpeng Li <[email protected]>
KVM: x86: fix escape of guest dr6 to the host
Douglas Gilbert <[email protected]>
blk_rq_map_user_iov: fix error override
Laura Abbott <[email protected]>
staging: android: ion: Switch from WARN to pr_warn
Laura Abbott <[email protected]>
staging: android: ion: Add __GFP_NOWARN for system contig heap
Eric Biggers <[email protected]>
crypto: x86/twofish-3way - Fix %rbp usage
Andrey Konovalov <[email protected]>
media: pvrusb2: properly check endpoint types
Paul Moore <[email protected]>
selinux: skip bounded transition processing if the policy isn't loaded
Paul Moore <[email protected]>
selinux: ensure the context is NUL terminated in security_context_to_sid_core()
Jason Wang <[email protected]>
ptr_ring: try vmalloc() when kmalloc() fails
Jason Wang <[email protected]>
ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE
Eric Dumazet <[email protected]>
tun: fix tun_napi_alloc_frags() frag allocator
-------------
Diffstat:
Makefile | 4 +- arch/arm/common/bL_switcher_dummy_if.c | 4 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 112 +++++++++++++----------- arch/x86/kvm/x86.c | 6 ++ block/blk-map.c | 4 +- drivers/android/binder.c | 29 ++++-- drivers/crypto/s5p-sss.c | 12 ++- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 12 +++ drivers/misc/mei/hw-me-regs.h | 5 ++ drivers/misc/mei/pci-me.c | 5 ++ drivers/net/tun.c | 16 ++-- drivers/soc/qcom/rmtfs_mem.c | 4 + drivers/staging/android/ashmem.c | 19 ++-- drivers/staging/android/ion/ion-ioctl.c | 4 +- drivers/staging/android/ion/ion_system_heap.c | 2 +- drivers/staging/fsl-mc/bus/Kconfig | 2 +- drivers/staging/iio/adc/ad7192.c | 27 ++++-- drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +- drivers/usb/host/xhci-debugfs.c | 4 +- drivers/usb/host/xhci.c | 10 +-- drivers/usb/usbip/stub_dev.c | 3 + drivers/usb/usbip/vhci_hcd.c | 2 + drivers/video/fbdev/mmp/core.c | 5 ++ include/linux/ptr_ring.h | 15 ++-- kernel/kcov.c | 4 +- mm/vmalloc.c | 10 ++- net/core/dev.c | 2 +- net/core/gen_estimator.c | 4 + net/decnet/af_decnet.c | 62 +++++++------ net/ipv4/ip_sockglue.c | 14 +-- net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 +++- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +- net/ipv6/ipv6_sockglue.c | 17 ++-- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 ++-- net/netfilter/x_tables.c | 9 +- net/netfilter/xt_RATEEST.c | 22 +++-- net/netfilter/xt_cgroup.c | 1 + net/rds/connection.c | 3 +- net/rds/rds.h | 6 +- net/rds/tcp.c | 13 ++- net/rds/tcp.h | 1 + security/selinux/ss/services.c | 21 ++--- sound/soc/ux500/mop500.c | 4 + sound/soc/ux500/ux500_pcm.c | 5 ++ 45 files changed, 348 insertions(+), 202 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/45 tun: fix tun_napi_alloc_frags() frag allocator
4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 43a08e0f58b3f236165029710a4e3b303815253b upstream.
<Mark Rutland reported>
While fuzzing arm64 v4.16-rc1 with Syzkaller, I've been hitting a misaligned atomic in __skb_clone:
atomic_inc(&(skb_shinfo(skb)->dataref));
where dataref doesn't have the required natural alignment, and the atomic operation faults. e.g. i often see it aligned to a single byte boundary rather than a four byte boundary.
AFAICT, the skb_shared_info is misaligned at the instant it's allocated in __napi_alloc_skb() __napi_alloc_skb()
</end of report>
Problem is caused by tun_napi_alloc_frags() using napi_alloc_frag() with user provided seg sizes, leading to other users of this API getting unaligned page fragments.
Since we would like to not necessarily add paddings or alignments to the frags that tun_napi_alloc_frags() attaches to the skb, switch to another page frag allocator.
As a bonus skb_page_frag_refill() can use GFP_KERNEL allocations, meaning that we can not deplete memory reserves as easily.
--- drivers/net/tun.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/net/tun.c +6 -10
@@ -1317,27 +1317,23 @@ static struct sk_buff *tun_napi_alloc_fr skb->truesize += skb->data_len;for (i =1 ; i < it->nr_segs; i++) { +struct page_frag *pfrag = ¤t->task_frag;size_t fragsz = it->iov[i].iov_len; -unsigned long offset; -struct page *page; -void *data;if (fragsz ==0 || fragsz >PAGE_SIZE ) { err = -EINVAL ; goto free; } -local_bh_disable (); - data =napi_alloc_frag (fragsz); -local_bh_enable (); -if (!data) { +if (!skb_page_frag_refill (fragsz, pfrag,GFP_KERNEL )) { err = -ENOMEM ; goto free; } - page =virt_to_head_page (data); - offset = data -page_address (page); -skb_fill_page_desc (skb, i -1 , page, offset, fragsz); +skb_fill_page_desc (skb, i -1 , pfrag->page, + pfrag->offset, fragsz); +page_ref_inc (pfrag->page); + pfrag->offset += fragsz; }return skb;
Greg Kroah-Hartman
maintainerPATCH 2/45 ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
commit 6e6e41c3112276288ccaf80c70916779b84bb276 upstream.
To avoid slab to warn about exceeded size, fail early if queue occupies more than KMALLOC_MAX_SIZE.
--- include/linux/ptr_ring.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/ptr_ring.h +2 -0
@@ -453,6 +453,8 @@ static inline int ptr_ring_consume_batchstatic inline void **__ptr_ring_init_queue_alloc (unsigned int size,gfp_t gfp) { +if (size *sizeof (void *) >KMALLOC_MAX_SIZE ) +return NULL ;return kcalloc (size,sizeof (void *), gfp); }
Greg Kroah-Hartman
maintainerPATCH 3/45 ptr_ring: try vmalloc() when kmalloc() fails
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
commit 0bf7800f1799b5b1fd7d4f024e9ece53ac489011 upstream.
This patch switch to use kvmalloc_array() for using a vmalloc() fallback to help in case kmalloc() fails.
--- include/linux/ptr_ring.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
include/linux/ptr_ring.h +8 -5
@@ -451,11 +451,14 @@ static inline int ptr_ring_consume_batch __PTR_RING_PEEK_CALL_v; \ }) +/* Not all gfp_t flags (besides GFP_KERNEL) are allowed. See +* documentation for vmalloc for which of them are legal. +*/ static inline void **__ptr_ring_init_queue_alloc (unsigned int size,gfp_t gfp) {if (size *sizeof (void *) >KMALLOC_MAX_SIZE )return NULL ; -return kcalloc (size,sizeof (void *), gfp); +return kvmalloc_array (size,sizeof (void *), gfp | __GFP_ZERO); }static inline void __ptr_ring_set_size (struct ptr_ring *r,int size)
@@ -588,7 +591,7 @@ static inline int ptr_ring_resize(structspin_unlock (&(r)->producer_lock);spin_unlock_irqrestore (&(r)->consumer_lock, flags); -kfree (old); +kvfree (old);return 0 ; }
@@ -628,7 +631,7 @@ static inline int ptr_ring_resize_multip }for (i =0 ; i < nrings; ++i) -kfree (queues[i]); +kvfree (queues[i]);kfree (queues);
@@ -636,7 +639,7 @@ static inline int ptr_ring_resize_multip nomem:while (--i >=0 ) -kfree (queues[i]); +kvfree (queues[i]);kfree (queues);
@@ -651,7 +654,7 @@ static inline void ptr_ring_cleanup(struif (destroy)while ((ptr =ptr_ring_consume (r)))destroy (ptr); - kfree(r->queue); + kvfree(r->queue); }#endif /* _LINUX_PTR_RING_H */
Greg Kroah-Hartman
maintainerPATCH 4/45 selinux: ensure the context is NUL terminated in security_context_to_sid_core()
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Moore <[email protected]>
commit ef28df55ac27e1e5cd122e19fa311d886d47a756 upstream.
The syzbot/syzkaller automated tests found a problem in security_context_to_sid_core() during early boot (before we load the SELinux policy) where we could potentially feed context strings without NUL terminators into the strcmp() function.
We already guard against this during normal operation (after the SELinux policy has been loaded) by making a copy of the context strings and explicitly adding a NUL terminator to the end. The patch extends this protection to the early boot case (no loaded policy) by moving the context copy earlier in security_context_to_sid_core().
--- security/selinux/ss/services.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
security/selinux/ss/services.c +8 -10
@@ -1413,27 +1413,25 @@ static int security_context_to_sid_core(if (!scontext_len)return -EINVAL ; +/* Copy the string to allow changes and ensure a NUL terminator */ + scontext2 =kmemdup_nul (scontext, scontext_len, gfp_flags); +if (!scontext2) +return -ENOMEM ; +if (!ss_initialized) {int i;for (i =1 ; i <SECINITSID_NUM ; i++) { -if (!strcmp (initial_sid_to_string[i], scontext)) { +if (!strcmp (initial_sid_to_string[i], scontext2)) { *sid = i; -return 0 ; + goto out; } } *sid =SECINITSID_KERNEL ; -return 0 ; + goto out; } *sid =SECSID_NULL ; -/* Copy the string so that we can modify the copy as we parse it. */ - scontext2 =kmalloc (scontext_len +1 , gfp_flags); -if (!scontext2) -return -ENOMEM ; -memcpy (scontext2, scontext, scontext_len); - scontext2[scontext_len] =0 ; -if (force) {/* Save another copy for storing in uninterpreted form */ rc = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 5/45 selinux: skip bounded transition processing if the policy isnt loaded
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Moore <[email protected]>
commit 4b14752ec4e0d87126e636384cf37c8dd9df157c upstream.
We can't do anything reasonable in security_bounded_transition() if we don't have a policy loaded, and in fact we could run into problems with some of the code inside expecting a policy. Fix these problems like we do many others in security/selinux/ss/services.c by checking to see if the policy is loaded (ss_initialized) and returning quickly if it isn't.
--- security/selinux/ss/services.c | 3 +++ 1 file changed, 3 insertions(+)
security/selinux/ss/services.c +3 -0
@@ -867,6 +867,9 @@ int security_bounded_transition(u32 old_int index;int rc; +if (!ss_initialized) +return 0 ; +read_lock (&policy_rwlock); rc = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 6/45 media: pvrusb2: properly check endpoint types
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Konovalov <[email protected]>
commit 72c27a68a2a3f650f0dc7891ee98f02283fc11af upstream.
As syzkaller detected, pvrusb2 driver submits bulk urb withount checking the the endpoint type is actually blunk. Add a check.
usb 1-1: BOGUS urb xfer, pipe 3 != type 1
------------[ cut here ]------------ WARNING: CPU: 1 PID: 2713 at drivers/usb/core/urb.c:449 usb_submit_urb+0xf8a/0x11d0 Modules linked in: CPU: 1 PID: 2713 Comm: pvrusb2-context Not tainted 4.14.0-rc1-42251-gebb2c2437d80 #210 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 task: ffff88006b7a18c0 task.stack: ffff880069978000 RIP: 0010:usb_submit_urb+0xf8a/0x11d0 drivers/usb/core/urb.c:448 RSP: 0018:ffff88006997f990 EFLAGS: 00010286 RAX: 0000000000000029 RBX: ffff880063661900 RCX: 0000000000000000 RDX: 0000000000000029 RSI: ffffffff86876d60 RDI: ffffed000d32ff24 RBP: ffff88006997fa90 R08: 1ffff1000d32fdca R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 1ffff1000d32ff39 R13: 0000000000000001 R14: 0000000000000003 R15: ffff880068bbed68 FS: 0000000000000000(0000) GS:ffff88006c600000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000001032000 CR3: 000000006a0ff000 CR4: 00000000000006f0 Call Trace: pvr2_send_request_ex+0xa57/0x1d80 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:3645 pvr2_hdw_check_firmware drivers/media/usb/pvrusb2/pvrusb2-hdw.c:1812 pvr2_hdw_setup_low drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2107 pvr2_hdw_setup drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2250 pvr2_hdw_initialize+0x548/0x3c10 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2327 pvr2_context_check drivers/media/usb/pvrusb2/pvrusb2-context.c:118 pvr2_context_thread_func+0x361/0x8c0 drivers/media/usb/pvrusb2/pvrusb2-context.c:167 kthread+0x3a1/0x470 kernel/kthread.c:231 ret_from_fork+0x2a/0x40 arch/x86/entry/entry_64.S:431 Code: 48 8b 85 30 ff ff ff 48 8d b8 98 00 00 00 e8 ee 82 89 fe 45 89 e8 44 89 f1 4c 89 fa 48 89 c6 48 c7 c7 40 c0 ea 86 e8 30 1b dc fc <0f> ff e9 9b f7 ff ff e8 aa 95 25 fd e9 80 f7 ff ff e8 50 74 f3 ---[ end trace 6919030503719da6 ]---
--- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +12 -0
@@ -3648,6 +3648,12 @@ static int pvr2_send_request_ex(struct p hdw); hdw->ctl_write_urb->actual_length =0 ; hdw->ctl_write_pend_flag = !0 ; +if (usb_urb_ep_type_check (hdw->ctl_write_urb)) { +pvr2_trace ( +PVR2_TRACE_ERROR_LEGS , +"Invalid write control endpoint" ); +return -EINVAL ; + } status =usb_submit_urb (hdw->ctl_write_urb,GFP_KERNEL );if (status <0 ) { pvr2_trace(PVR2_TRACE_ERROR_LEGS,
@@ -3672,6 +3678,12 @@ status); hdw); hdw->ctl_read_urb->actual_length =0 ; hdw->ctl_read_pend_flag = !0 ; +if (usb_urb_ep_type_check (hdw->ctl_read_urb)) { +pvr2_trace ( +PVR2_TRACE_ERROR_LEGS , +"Invalid read control endpoint" ); +return -EINVAL ; + } status =usb_submit_urb (hdw->ctl_read_urb,GFP_KERNEL );if (status <0 ) { pvr2_trace(PVR2_TRACE_ERROR_LEGS,
Greg Kroah-Hartman
maintainerPATCH 7/45 crypto: x86/twofish-3way - Fix %rbp usage
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit d8c7fe9f2a486a6e5f0d5229ca43807af5ab22c6 upstream.
Using %rbp as a temporary register breaks frame pointer convention and breaks stack traces when unwinding from an interrupt in the crypto code.
In twofish-3way, we can't simply replace %rbp with another register because there are none available. Instead, we use the stack to hold the values that %rbp, %r11, and %r12 were holding previously. Each of these values represents the half of the output from the previous Feistel round that is being passed on unchanged to the following round. They are only used once per round, when they are exchanged with %rax, %rbx, and %rcx.
As a result, we free up 3 registers (one per block) and can reassign them so that %rbp is not used, and additionally %r14 and %r15 are not used so they do not need to be saved/restored.
There may be a small overhead caused by replacing 'xchg REG, REG' with the needed sequence 'mov MEM, REG; mov REG, MEM; mov REG, REG' once per round. But, counterintuitively, when I tested "ctr-twofish-3way" on a Haswell processor, the new version was actually about 2% faster. (Perhaps 'xchg' is not as well optimized as plain moves.)
--- arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 118 ++++++++++++++------------- 1 file changed, 63 insertions(+), 55 deletions(-)
arch/x86/crypto/twofish-x86_64-asm_64-3way.S +63 -55
@@ -55,29 +55,31 @@ #define RAB1bl %bl #define RAB2bl %cl +#define CD0 0x0(%rsp) +#define CD1 0x8(%rsp) +#define CD2 0x10(%rsp) + +# used only before/after all rounds #define RCD0 %r8 #define RCD1 %r9 #define RCD2 %r10 -#define RCD0d %r8d -#define RCD1d %r9d -#define RCD2d %r10d - -#define RX0 %rbp -#define RX1 %r11 -#define RX2 %r12 - -#define RX0d %ebp -#define RX1d %r11d -#define RX2d %r12d - -#define RY0 %r13 -#define RY1 %r14 -#define RY2 %r15 - -#define RY0d %r13d -#define RY1d %r14d -#define RY2d %r15d +# used only during rounds +#define RX0 %r8 +#define RX1 %r9 +#define RX2 %r10 + +#define RX0d %r8d +#define RX1d %r9d +#define RX2d %r10d + +#define RY0 %r11 +#define RY1 %r12 +#define RY2 %r13 + +#define RY0d %r11d +#define RY1d %r12d +#define RY2d %r13d #define RT0 %rdx #define RT1 %rsi
@@ -85,6 +87,8 @@ #define RT0d %edx #define RT1d %esi +#define RT1bl %sil + #define do16bit_ror(rot, op1, op2, T0, T1, tmp1, tmp2, ab, dst) \ movzbl ab ## bl, tmp2 ## d; \ movzbl ab ## bh, tmp1 ## d; \
@@ -92,6 +96,11 @@ op1##l T0(CTX, tmp2, 4), dst ## d; \ op2##l T1(CTX, tmp1, 4), dst ## d; +#define swap_ab_with_cd(ab, cd, tmp) \ + movq cd, tmp; \ + movq ab, cd; \ + movq tmp, ab; + /* * Combined G1 & G2 function. Reordered with help of rotates to have moves * at begining.
@@ -110,15 +119,15 @@ /* G1,2 && G2,2 */ \ do16bit_ror(32, xor, xor, Tx2, Tx3, RT0, RT1, ab ## 0, x ## 0); \ do16bit_ror(16, xor, xor, Ty3, Ty0, RT0, RT1, ab ## 0, y ## 0); \ - xchgq cd ## 0, ab ## 0; \ + swap_ab_with_cd(ab ## 0, cd ## 0, RT0); \ \ do16bit_ror(32, xor, xor, Tx2, Tx3, RT0, RT1, ab ## 1, x ## 1); \ do16bit_ror(16, xor, xor, Ty3, Ty0, RT0, RT1, ab ## 1, y ## 1); \ - xchgq cd ## 1, ab ## 1; \ + swap_ab_with_cd(ab ## 1, cd ## 1, RT0); \ \ do16bit_ror(32, xor, xor, Tx2, Tx3, RT0, RT1, ab ## 2, x ## 2); \ do16bit_ror(16, xor, xor, Ty3, Ty0, RT0, RT1, ab ## 2, y ## 2); \ - xchgq cd ## 2, ab ## 2; + swap_ab_with_cd(ab ## 2, cd ## 2, RT0); #define enc_round_end(ab, x, y, n) \ addl y ## d, x ## d; \
@@ -168,6 +177,16 @@ decrypt_round3(ba, dc, (n*2)+1); \ decrypt_round3(ba, dc, (n*2)); +#define push_cd() \ + pushq RCD2; \ + pushq RCD1; \ + pushq RCD0; + +#define pop_cd() \ + popq RCD0; \ + popq RCD1; \ + popq RCD2; + #define inpack3(in, n, xy, m) \ movq 4*(n)(in), xy ## 0; \ xorq w+4*m(CTX), xy ## 0; \
@@ -223,11 +242,8 @@ ENTRY(__twofish_enc_blk_3way) * %rdx: src, RIO * %rcx: bool, if true: xor output */ - pushq %r15; - pushq %r14; pushq %r13; pushq %r12; - pushq %rbp; pushq %rbx; pushq %rcx; /* bool xor */
@@ -235,40 +251,36 @@ ENTRY(__twofish_enc_blk_3way) inpack_enc3(); - encrypt_cycle3(RAB, RCD, 0); - encrypt_cycle3(RAB, RCD, 1); - encrypt_cycle3(RAB, RCD, 2); - encrypt_cycle3(RAB, RCD, 3); - encrypt_cycle3(RAB, RCD, 4); - encrypt_cycle3(RAB, RCD, 5); - encrypt_cycle3(RAB, RCD, 6); - encrypt_cycle3(RAB, RCD, 7); + push_cd(); + encrypt_cycle3(RAB, CD, 0); + encrypt_cycle3(RAB, CD, 1); + encrypt_cycle3(RAB, CD, 2); + encrypt_cycle3(RAB, CD, 3); + encrypt_cycle3(RAB, CD, 4); + encrypt_cycle3(RAB, CD, 5); + encrypt_cycle3(RAB, CD, 6); + encrypt_cycle3(RAB, CD, 7); + pop_cd(); popq RIO; /* dst */ - popq %rbp; /* bool xor */ + popq RT1; /* bool xor */ - testb %bpl, %bpl; + testb RT1bl, RT1bl; jnz .L__enc_xor3; outunpack_enc3(mov); popq %rbx; - popq %rbp; popq %r12; popq %r13; - popq %r14; - popq %r15; ret; .L__enc_xor3: outunpack_enc3(xor); popq %rbx; - popq %rbp; popq %r12; popq %r13; - popq %r14; - popq %r15; ret; ENDPROC(__twofish_enc_blk_3way)
@@ -278,35 +290,31 @@ ENTRY(twofish_dec_blk_3way) * %rsi: dst * %rdx: src, RIO */ - pushq %r15; - pushq %r14; pushq %r13; pushq %r12; - pushq %rbp; pushq %rbx; pushq %rsi; /* dst */ inpack_dec3(); - decrypt_cycle3(RAB, RCD, 7); - decrypt_cycle3(RAB, RCD, 6); - decrypt_cycle3(RAB, RCD, 5); - decrypt_cycle3(RAB, RCD, 4); - decrypt_cycle3(RAB, RCD, 3); - decrypt_cycle3(RAB, RCD, 2); - decrypt_cycle3(RAB, RCD, 1); - decrypt_cycle3(RAB, RCD, 0); + push_cd(); + decrypt_cycle3(RAB, CD, 7); + decrypt_cycle3(RAB, CD, 6); + decrypt_cycle3(RAB, CD, 5); + decrypt_cycle3(RAB, CD, 4); + decrypt_cycle3(RAB, CD, 3); + decrypt_cycle3(RAB, CD, 2); + decrypt_cycle3(RAB, CD, 1); + decrypt_cycle3(RAB, CD, 0); + pop_cd(); popq RIO; /* dst */ outunpack_dec3(); popq %rbx; - popq %rbp; popq %r12; popq %r13; - popq %r14; - popq %r15; ret; ENDPROC(twofish_dec_blk_3way)
Greg Kroah-Hartman
maintainerPATCH 8/45 staging: android: ion: Add __GFP_NOWARN for system contig heap
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laura Abbott <[email protected]>
commit 0c75f10312a35b149b2cebb1832316b35c2337ca upstream.
syzbot reported a warning from Ion:
WARNING: CPU: 1 PID: 3485 at mm/page_alloc.c:3926
...
__alloc_pages_nodemask+0x9fb/0xd80 mm/page_alloc.c:4252 alloc_pages_current+0xb6/0x1e0 mm/mempolicy.c:2036 alloc_pages include/linux/gfp.h:492 [inline] ion_system_contig_heap_allocate+0x40/0x2c0 drivers/staging/android/ion/ion_system_heap.c:374 ion_buffer_create drivers/staging/android/ion/ion.c:93 [inline] ion_alloc+0x2c1/0x9e0 drivers/staging/android/ion/ion.c:420 ion_ioctl+0x26d/0x380 drivers/staging/android/ion/ion-ioctl.c:84 vfs_ioctl fs/ioctl.c:46 [inline] do_vfs_ioctl+0x1b1/0x1520 fs/ioctl.c:686 SYSC_ioctl fs/ioctl.c:701 [inline] SyS_ioctl+0x8f/0xc0 fs/ioctl.c:692
This is a warning about attempting to allocate order > MAX_ORDER. This is coming from a userspace Ion allocation request. Since userspace is free to request however much memory it wants (and the kernel is free to deny its allocation), silence the allocation attempt with __GFP_NOWARN in case it fails.
--- drivers/staging/android/ion/ion_system_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/android/ion/ion_system_heap.c +1 -1
@@ -371,7 +371,7 @@ static int ion_system_contig_heap_allocaunsigned long i;int ret; - page =alloc_pages (low_order_gfp_flags, order); + page =alloc_pages (low_order_gfp_flags | __GFP_NOWARN, order);if (!page)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 9/45 staging: android: ion: Switch from WARN to pr_warn
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laura Abbott <[email protected]>
commit e4e179a844f52e907e550f887d0a2171f1508af1 upstream.
Syzbot reported a warning with Ion:
WARNING: CPU: 0 PID: 3502 at drivers/staging/android/ion/ion-ioctl.c:73 ion_ioctl+0x2db/0x380 drivers/staging/android/ion/ion-ioctl.c:73 Kernel panic - not syncing: panic_on_warn set ...
This is a warning that validation of the ioctl fields failed. This was deliberately added as a warning to make it very obvious to developers that something needed to be fixed. In reality, this is overkill and disturbs fuzzing. Switch to pr_warn for a message instead.
--- drivers/staging/android/ion/ion-ioctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/android/ion/ion-ioctl.c +3 -1
@@ -70,8 +70,10 @@ long ion_ioctl(struct file *filp, unsignreturn -EFAULT ; ret =validate_ioctl_arg (cmd, &data); -if (WARN_ON_ONCE (ret)) +if (ret) { +pr_warn_once ("%s: ioctl validate failed\n" , __func__);return ret; + }if (!(dir & _IOC_WRITE))memset (&data,0 ,sizeof (data));
Greg Kroah-Hartman
maintainerPATCH 10/45 blk_rq_map_user_iov: fix error override
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Gilbert <[email protected]>
commit 69e0927b3774563c19b5fb32e91d75edc147fb62 upstream.
During stress tests by syzkaller on the sg driver the block layer infrequently returns EINVAL. Closer inspection shows the block layer was trying to return ENOMEM (which is much more understandable) but for some reason overroad that useful error.
Patch below does not show this (unchanged) line:
ret =__blk_rq_map_user_iov(rq, map_data, &i, gfp_mask, copy);
That 'ret' was being overridden when that function failed.
--- block/blk-map.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/blk-map.c +2 -2
@@ -119,7 +119,7 @@ int blk_rq_map_user_iov(struct request_qunsigned long align = q->dma_pad_mask |queue_dma_alignment (q);struct bio *bio =NULL ;struct iov_iter i; -int ret; +int ret = -EINVAL ;if (!iter_is_iovec (iter)) goto fail;
@@ -148,7 +148,7 @@ unmap_rq:__blk_rq_unmap_user (bio); fail: rq->bio =NULL ; -return -EINVAL ; +return ret; }EXPORT_SYMBOL (blk_rq_map_user_iov);
Greg Kroah-Hartman
maintainerPATCH 11/45 KVM: x86: fix escape of guest dr6 to the host
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wanpeng Li <[email protected]>
commit efdab992813fb2ed825745625b83c05032e9cda2 upstream.
syzkaller reported:
WARNING: CPU: 0 PID: 12927 at arch/x86/kernel/traps.c:780 do_debug+0x222/0x250
CPU: 0 PID: 12927 Comm: syz-executor Tainted: G OE 4.15.0-rc2+ #16
RIP: 0010:do_debug+0x222/0x250
Call Trace:
<#DB>
debug+0x3e/0x70
RIP: 0010:copy_user_enhanced_fast_string+0x10/0x20
</#DB>
_copy_from_user+0x5b/0x90
SyS_timer_create+0x33/0x80
entry_SYSCALL_64_fastpath+0x23/0x9aThe testcase sets a watchpoint (with perf_event_open) on a buffer that is passed to timer_create() as the struct sigevent argument. In timer_create(), copy_from_user()'s rep movsb triggers the BP. The testcase also sets the debug registers for the guest.
However, KVM only restores host debug registers when the host has active watchpoints, which triggers a race condition when running the testcase with multiple threads. The guest's DR6.BS bit can escape to the host before another thread invokes timer_create(), and do_debug() complains.
The fix is to respect do_debug()'s dr6 invariant when leaving KVM.
--- arch/x86/kvm/x86.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kvm/x86.c +6 -0
@@ -2939,6 +2939,12 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *pagefault_enable (); kvm_x86_ops->vcpu_put (vcpu); vcpu->arch.last_host_tsc =rdtsc (); +/* +* If userspace has set any breakpoints or watchpoints, dr6 is restored +* on every vmexit, but if not, we might have a stale dr6 from the +* guest. do_debug expects dr6 to be cleared after it runs, do the same. +*/ +set_debugreg (0 ,6 ); } static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu,
Greg Kroah-Hartman
maintainerPATCH 12/45 kcov: detect double association with a single task
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Vyukov <[email protected]>
commit a77660d231f8b3d84fd23ed482e0964f7aa546d6 upstream.
Currently KCOV_ENABLE does not check if the current task is already associated with another kcov descriptor. As the result it is possible to associate a single task with more than one kcov descriptor, which later leads to a memory leak of the old descriptor. This relation is really meant to be one-to-one (task has only one back link).
Extend validation to detect such misuse.
--- kernel/kcov.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/kcov.c +2 -2
@@ -358,7 +358,8 @@ static int kcov_ioctl_locked(struct kcov*/ if (kcov->mode !=KCOV_MODE_INIT || !kcov->area)return -EINVAL ; -if (kcov->t !=NULL ) + t = current; +if (kcov->t !=NULL || t->kcov !=NULL )return -EBUSY ;if (arg ==KCOV_TRACE_PC ) kcov->mode =KCOV_MODE_TRACE_PC ;
@@ -370,7 +371,6 @@ static int kcov_ioctl_locked(struct kcov#endif else return -EINVAL; - t = current;/* Cache in task struct for performance. */ t->kcov_size = kcov->size; t->kcov_area = kcov->area;
Greg Kroah-Hartman
maintainerPATCH 13/45 netfilter: x_tables: fix int overflow in xt_alloc_table_info()
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Vyukov <[email protected]>
commit 889c604fd0b5f6d3b8694ade229ee44124de1127 upstream.
syzkaller triggered OOM kills by passing ipt_replace.size = -1 to IPT_SO_SET_REPLACE. The root cause is that SMP_ALIGN() in xt_alloc_table_info() causes int overflow and the size check passes when it should not. SMP_ALIGN() is no longer needed leftover.
Remove SMP_ALIGN() call in xt_alloc_table_info().
--- net/netfilter/x_tables.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/netfilter/x_tables.c +1 -2
@@ -39,7 +39,6 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Harald Welte <[email protected]>" );MODULE_DESCRIPTION ("{ip,ip6,arp,eb}_tables backend module" ); -#define SMP_ALIGN (x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))#define XT_PCPU_BLOCK_SIZE 4096struct compat_delta {
@@ -1000,7 +999,7 @@ struct xt_table_info *xt_alloc_table_infreturn NULL ;/* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */ -if ((SMP_ALIGN (size) >>PAGE_SHIFT ) +2 > totalram_pages) +if ((size >>PAGE_SHIFT ) +2 > totalram_pages)return NULL ; info =kvmalloc (sz,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 14/45 netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target}
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit da17c73b6eb74aad3c3c0654394635675b623b3e upstream.
It looks like syzbot found its way into netfilter territory.
Issue here is that @name comes from user space and might not be null terminated.
Out-of-bound reads happen, KASAN is not happy.
v2 added similar fix for xt_request_find_target(), as Florian advised.
--- net/netfilter/x_tables.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/x_tables.c +6 -0
@@ -209,6 +209,9 @@ xt_request_find_match(uint8_t nfproto, c {struct xt_match *match; +if (strnlen (name,XT_EXTENSION_MAXNAMELEN ) ==XT_EXTENSION_MAXNAMELEN ) +return ERR_PTR (-EINVAL ); + match =xt_find_match (nfproto, name, revision);if (IS_ERR (match)) {request_module ("%st_%s" , xt_prefix[nfproto], name);
@@ -251,6 +254,9 @@ struct xt_target *xt_request_find_target {struct xt_target *target; +if (strnlen (name,XT_EXTENSION_MAXNAMELEN ) ==XT_EXTENSION_MAXNAMELEN ) +return ERR_PTR (-EINVAL ); + target =xt_find_target (af, name, revision);if (IS_ERR (target)) {request_module ("%st_%s" , xt_prefix[af], name);
Greg Kroah-Hartman
maintainerPATCH 15/45 netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check()
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Vyukov <[email protected]>
commit 1a38956cce5eabd7b74f94bab70265e4df83165e upstream.
Commit 136e92bbec0a switched local_nodes from an array to a bitmask but did not add proper bounds checks. As the result clusterip_config_init_nodelist() can both over-read ipt_clusterip_tgt_info.local_nodes and over-write clusterip_config.local_nodes.
Add bounds checks for both.
--- net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
net/ipv4/netfilter/ipt_CLUSTERIP.c +13 -3
@@ -431,7 +431,7 @@ static int clusterip_tg_check(const strustruct ipt_clusterip_tgt_info *cipinfo = par->targinfo;const struct ipt_entry *e = par->entryinfo;struct clusterip_config *config; -int ret; +int ret, i;if (par->nft_compat) {pr_err ("cannot use CLUSTERIP target from nftables compat\n" );
@@ -450,8 +450,18 @@ static int clusterip_tg_check(const strupr_info ("Please specify destination IP\n" );return -EINVAL ; } - -/* FIXME: further sanity checks */ +if (cipinfo->num_local_nodes >ARRAY_SIZE (cipinfo->local_nodes)) { +pr_info ("bad num_local_nodes %u\n" , cipinfo->num_local_nodes); +return -EINVAL ; + } +for (i =0 ; i < cipinfo->num_local_nodes; i++) { +if (cipinfo->local_nodes[i] -1 >= +sizeof (config->local_nodes) *8 ) { +pr_info ("bad local_nodes[%d] %u\n" , + i, cipinfo->local_nodes[i]); +return -EINVAL ; + } + } config =clusterip_config_find_get (par->net, e->ip.dst.s_addr,1 );if (!config) {
Greg Kroah-Hartman
maintainerPATCH 16/45 netfilter: on sockopt() acquire sock lock only in the required scope
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit 3f34cfae1238848fd53f25e5c8fd59da57901f4b upstream.
Syzbot reported several deadlocks in the netfilter area caused by rtnl lock and socket lock being acquired with a different order on different code paths, leading to backtraces like the following one:
======================================================
WARNING: possible circular locking dependency detected 4.15.0-rc9+ #212 Not tainted
------------------------------------------------------
syzkaller041579/3682 is trying to acquire lock:
(sk_lock-AF_INET6){+.+.}, at: [<000000008775e4dd>] lock_sockinclude/net/sock.h:1463 [inline]
(sk_lock-AF_INET6){+.+.}, at: [<000000008775e4dd>]
do_ipv6_setsockopt.isra.8+0x3c5/0x39d0 net/ipv6/ipv6_sockglue.c:167
but task is already holding lock:
(rtnl_mutex){+.+.}, at: [<000000004342eaa9>] rtnl_lock+0x17/0x20net/core/rtnetlink.c:74
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (rtnl_mutex){+.+.}:
__mutex_lock_common kernel/locking/mutex.c:756 [inline]
__mutex_lock+0x16f/0x1a80 kernel/locking/mutex.c:893
mutex_lock_nested+0x16/0x20 kernel/locking/mutex.c:908
rtnl_lock+0x17/0x20 net/core/rtnetlink.c:74
register_netdevice_notifier+0xad/0x860 net/core/dev.c:1607
tee_tg_check+0x1a0/0x280 net/netfilter/xt_TEE.c:106
xt_check_target+0x22c/0x7d0 net/netfilter/x_tables.c:845
check_target net/ipv6/netfilter/ip6_tables.c:538 [inline]
find_check_entry.isra.7+0x935/0xcf0
net/ipv6/netfilter/ip6_tables.c:580
translate_table+0xf52/0x1690 net/ipv6/netfilter/ip6_tables.c:749
do_replace net/ipv6/netfilter/ip6_tables.c:1165 [inline]
do_ip6t_set_ctl+0x370/0x5f0 net/ipv6/netfilter/ip6_tables.c:1691
nf_sockopt net/netfilter/nf_sockopt.c:106 [inline]
nf_setsockopt+0x67/0xc0 net/netfilter/nf_sockopt.c:115
ipv6_setsockopt+0x115/0x150 net/ipv6/ipv6_sockglue.c:928
udpv6_setsockopt+0x45/0x80 net/ipv6/udp.c:1422
sock_common_setsockopt+0x95/0xd0 net/core/sock.c:2978
SYSC_setsockopt net/socket.c:1849 [inline]
SyS_setsockopt+0x189/0x360 net/socket.c:1828
entry_SYSCALL_64_fastpath+0x29/0xa0-> #0 (sk_lock-AF_INET6){+.+.}:
lock_acquire+0x1d5/0x580 kernel/locking/lockdep.c:3914
lock_sock_nested+0xc2/0x110 net/core/sock.c:2780
lock_sock include/net/sock.h:1463 [inline]
do_ipv6_setsockopt.isra.8+0x3c5/0x39d0 net/ipv6/ipv6_sockglue.c:167
ipv6_setsockopt+0xd7/0x150 net/ipv6/ipv6_sockglue.c:922
udpv6_setsockopt+0x45/0x80 net/ipv6/udp.c:1422
sock_common_setsockopt+0x95/0xd0 net/core/sock.c:2978
SYSC_setsockopt net/socket.c:1849 [inline]
SyS_setsockopt+0x189/0x360 net/socket.c:1828
entry_SYSCALL_64_fastpath+0x29/0xa0other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(rtnl_mutex);
lock(sk_lock-AF_INET6);
lock(rtnl_mutex); lock(sk_lock-AF_INET6);
*** DEADLOCK ***
1 lock held by syzkaller041579/3682:
#0: (rtnl_mutex){+.+.}, at: [<000000004342eaa9>] rtnl_lock+0x17/0x20net/core/rtnetlink.c:74
The problem, as Florian noted, is that nf_setsockopt() is always called with the socket held, even if the lock itself is required only for very tight scopes and only for some operation.
This patch addresses the issues moving the lock_sock() call only where really needed, namely in ipv*_getorigdst(), so that nf_setsockopt() does not need anymore to acquire both locks.
--- net/ipv4/ip_sockglue.c | 14 ++++---------- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +++++- net/ipv6/ipv6_sockglue.c | 17 +++++------------ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 ++++++++++++------ 4 files changed, 26 insertions(+), 29 deletions(-)
net/ipv4/ip_sockglue.c +4 -10
@@ -1251,11 +1251,8 @@ int ip_setsockopt(struct sock *sk, int lif (err == -ENOPROTOOPT && optname !=IP_HDRINCL && optname !=IP_IPSEC_POLICY && optname !=IP_XFRM_POLICY && - !ip_mroute_opt (optname)) { -lock_sock (sk); + !ip_mroute_opt (optname)) err =nf_setsockopt (sk,PF_INET , optname, optval, optlen); -release_sock (sk); - }#endif return err; }
@@ -1280,12 +1277,9 @@ int compat_ip_setsockopt(struct sock *skif (err == -ENOPROTOOPT && optname !=IP_HDRINCL && optname !=IP_IPSEC_POLICY && optname !=IP_XFRM_POLICY && - !ip_mroute_opt (optname)) { -lock_sock (sk); - err =compat_nf_setsockopt (sk,PF_INET , optname, - optval, optlen); -release_sock (sk); - } + !ip_mroute_opt (optname)) + err =compat_nf_setsockopt (sk,PF_INET , optname, optval, + optlen);#endif return err; }
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +5 -1
@@ -218,15 +218,19 @@ getorigdst(struct sock *sk, int optval,struct nf_conntrack_tuple tuple;memset (&tuple,0 ,sizeof (tuple)); + +lock_sock (sk); tuple.src.u3.ip = inet->inet_rcv_saddr; tuple.src.u.tcp.port = inet->inet_sport; tuple.dst.u3.ip = inet->inet_daddr; tuple.dst.u.tcp.port = inet->inet_dport; tuple.src.l3num =PF_INET ; tuple.dst.protonum = sk->sk_protocol; +release_sock (sk);/* We only do TCP and SCTP at the moment: is there a better way? */ -if (sk->sk_protocol !=IPPROTO_TCP && sk->sk_protocol !=IPPROTO_SCTP ) { +if (tuple.dst.protonum !=IPPROTO_TCP && + tuple.dst.protonum !=IPPROTO_SCTP ) {pr_debug ("SO_ORIGINAL_DST: Not a TCP/SCTP socket\n" );return -ENOPROTOOPT ; }
net/ipv6/ipv6_sockglue.c +5 -12
@@ -923,12 +923,8 @@ int ipv6_setsockopt(struct sock *sk, int#ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err == -ENOPROTOOPT && optname !=IPV6_IPSEC_POLICY && - optname !=IPV6_XFRM_POLICY ) { -lock_sock (sk); - err =nf_setsockopt (sk,PF_INET6 , optname, optval, - optlen); -release_sock (sk); - } + optname !=IPV6_XFRM_POLICY ) + err =nf_setsockopt (sk,PF_INET6 , optname, optval, optlen);#endif return err; }
@@ -958,12 +954,9 @@ int compat_ipv6_setsockopt(struct sock *#ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err == -ENOPROTOOPT && optname !=IPV6_IPSEC_POLICY && - optname !=IPV6_XFRM_POLICY ) { -lock_sock (sk); - err =compat_nf_setsockopt (sk,PF_INET6 , optname, - optval, optlen); -release_sock (sk); - } + optname !=IPV6_XFRM_POLICY ) + err =compat_nf_setsockopt (sk,PF_INET6 , optname, optval, + optlen);#endif return err; }
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +12 -6
@@ -226,20 +226,27 @@ static const struct nf_hook_ops ipv6_constatic int ipv6_getorigdst (struct sock *sk,int optval,void __user *user,int *len) { -const struct inet_sock *inet =inet_sk (sk); +struct nf_conntrack_tuple tuple = { .src.l3num =NFPROTO_IPV6 };const struct ipv6_pinfo *inet6 =inet6_sk (sk); +const struct inet_sock *inet =inet_sk (sk);const struct nf_conntrack_tuple_hash *h;struct sockaddr_in6 sin6; -struct nf_conntrack_tuple tuple = { .src.l3num =NFPROTO_IPV6 };struct nf_conn *ct; +__be32 flow_label; +int bound_dev_if; +lock_sock (sk); tuple.src.u3.in6 = sk->sk_v6_rcv_saddr; tuple.src.u.tcp.port = inet->inet_sport; tuple.dst.u3.in6 = sk->sk_v6_daddr; tuple.dst.u.tcp.port = inet->inet_dport; tuple.dst.protonum = sk->sk_protocol; + bound_dev_if = sk->sk_bound_dev_if; + flow_label = inet6->flow_label; +release_sock (sk); -if (sk->sk_protocol !=IPPROTO_TCP && sk->sk_protocol !=IPPROTO_SCTP ) +if (tuple.dst.protonum !=IPPROTO_TCP && + tuple.dst.protonum !=IPPROTO_SCTP )return -ENOPROTOOPT ;if (*len <0 || (unsigned int ) *len <sizeof (sin6))
@@ -257,14 +264,13 @@ ipv6_getorigdst(struct sock *sk, int opt sin6.sin6_family =AF_INET6 ; sin6.sin6_port = ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.u.tcp.port; - sin6.sin6_flowinfo = inet6->flow_label &IPV6_FLOWINFO_MASK ; + sin6.sin6_flowinfo = flow_label &IPV6_FLOWINFO_MASK ;memcpy (&sin6.sin6_addr, &ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.u3.in6,sizeof (sin6.sin6_addr));nf_ct_put (ct); - sin6.sin6_scope_id =ipv6_iface_scope_id (&sin6.sin6_addr, - sk->sk_bound_dev_if); + sin6.sin6_scope_id =ipv6_iface_scope_id (&sin6.sin6_addr, bound_dev_if);return copy_to_user (user, &sin6,sizeof (sin6)) ? -EFAULT :0 ; }
Greg Kroah-Hartman
maintainerPATCH 17/45 netfilter: xt_cgroup: initialize info->priv in cgroup_mt_check_v1()
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
commit ba7cd5d95f25cc6005f687dabdb4e7a6063adda9 upstream.
xt_cgroup_info_v1->priv is an internal pointer only used for kernel, we should not trust what user-space provides.
--- net/netfilter/xt_cgroup.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/xt_cgroup.c +1 -0
@@ -52,6 +52,7 @@ static int cgroup_mt_check_v1(const strureturn -EINVAL ; } + info->priv =NULL ;if (info->has_path) { cgrp =cgroup_get_from_path (info->path);if (IS_ERR (cgrp)) {
Greg Kroah-Hartman
maintainerPATCH 18/45 netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
commit 7dc68e98757a8eccf8ca7a53a29b896f1eef1f76 upstream.
rateest_hash is supposed to be protected by xt_rateest_mutex, and, as suggested by Eric, lookup and insert should be atomic, so we should acquire the xt_rateest_mutex once for both.
So introduce a non-locking helper for internal use and keep the locking one for external.
--- net/netfilter/xt_RATEEST.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
net/netfilter/xt_RATEEST.c +17 -5
@@ -39,23 +39,31 @@ static void xt_rateest_hash_insert(struchlist_add_head (&est->list, &rateest_hash[h]); } -struct xt_rateest *xt_rateest_lookup (const char *name) +static struct xt_rateest *__xt_rateest_lookup (const char *name) {struct xt_rateest *est;unsigned int h; h =xt_rateest_hash (name); -mutex_lock (&xt_rateest_mutex);hlist_for_each_entry (est, &rateest_hash[h], list) {if (strcmp (est->name, name) ==0 ) { est->refcnt++; -mutex_unlock (&xt_rateest_mutex);return est; } } -mutex_unlock (&xt_rateest_mutex); +return NULL ; } + +struct xt_rateest *xt_rateest_lookup (const char *name) +{ +struct xt_rateest *est; + +mutex_lock (&xt_rateest_mutex); + est =__xt_rateest_lookup (name); +mutex_unlock (&xt_rateest_mutex); +return est; +}EXPORT_SYMBOL_GPL (xt_rateest_lookup);void xt_rateest_put (struct xt_rateest *est)
@@ -100,8 +108,10 @@ static int xt_rateest_tg_checkentry(consnet_get_random_once (&jhash_rnd,sizeof (jhash_rnd)); - est =xt_rateest_lookup (info->name); +mutex_lock (&xt_rateest_mutex); + est =__xt_rateest_lookup (info->name);if (est) { +mutex_unlock (&xt_rateest_mutex);/* * If estimator parameters are specified, they must match the * existing estimator.
@@ -139,11 +149,13 @@ static int xt_rateest_tg_checkentry(cons info->est = est;xt_rateest_hash_insert (est); +mutex_unlock (&xt_rateest_mutex);return 0 ; err2:kfree (est); err1: +mutex_unlock (&xt_rateest_mutex);return ret; }
Greg Kroah-Hartman
maintainerPATCH 19/45 rds: tcp: correctly sequence cleanup on netns deletion.
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sowmini Varadhan <[email protected]>
commit 681648e67d43cf269c5590ecf021ed481f4551fc upstream.
Commit 8edc3affc077 ("rds: tcp: Take explicit refcounts on struct net") introduces a regression in rds-tcp netns cleanup. The cleanup_net(), (and thus rds_tcp_dev_event notification) is only called from put_net() when all netns refcounts go to 0, but this cannot happen if the rds_connection itself is holding a c_net ref that it expects to release in rds_tcp_kill_sock.
Instead, the rds_tcp_kill_sock callback should make sure to tear down state carefully, ensuring that the socket teardown is only done after all data-structures and workqs that depend on it are quiesced.
The original motivation for commit 8edc3affc077 ("rds: tcp: Take explicit refcounts on struct net") was to resolve a race condition reported by syzkaller where workqs for tx/rx/connect were triggered after the namespace was deleted. Those worker threads should have been cancelled/flushed before socket tear-down and indeed, rds_conn_path_destroy() does try to sequence this by doing
/* cancel cp_send_w */
/* cancel cp_recv_w */
/* flush cp_down_w */
/* free data structures */Here the "flush cp_down_w" will trigger rds_conn_shutdown and thus invoke rds_tcp_conn_path_shutdown() to close the tcp socket, so that we ought to have satisfied the requirement that "socket-close is done after all other dependent state is quiesced". However, rds_conn_shutdown has a bug in that it *always* triggers the reconnect workq (and if connection is successful, we always restart tx/rx workqs so with the right timing, we risk the race conditions reported by syzkaller).
Netns deletion is like module teardown- no need to restart a reconnect in this case. We can use the c_destroy_in_prog bit to avoid restarting the reconnect.
--- net/rds/connection.c | 3 ++- net/rds/rds.h | 6 +++--- net/rds/tcp.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-)
net/rds/connection.c +2 -1
@@ -366,6 +366,8 @@ void rds_conn_shutdown(struct rds_conn_p* to the conn hash, so we never trigger a reconnect on this * conn - the reconnect is always triggered by the active peer. */ cancel_delayed_work_sync (&cp->cp_conn_w); +if (conn->c_destroy_in_prog) +return ;rcu_read_lock ();if (!hlist_unhashed (&conn->c_hash_node)) {rcu_read_unlock ();
@@ -445,7 +447,6 @@ void rds_conn_destroy(struct rds_connect*/ rds_cong_remove_conn (conn); -put_net (conn->c_net);kfree (conn->c_path);kmem_cache_free (rds_conn_slab, conn);
net/rds/rds.h +3 -3
@@ -150,7 +150,7 @@ struct rds_connection {/* Protocol version */ unsigned int c_version; -struct net *c_net; +possible_net_t c_net;struct list_head c_map_item;unsigned long c_map_queued;
@@ -165,13 +165,13 @@ struct rds_connection {static inline struct net *rds_conn_net (struct rds_connection *conn) { -return conn->c_net; +return read_pnet (&conn->c_net); }static inline void rds_conn_net_set (struct rds_connection *conn,struct net *net) { - conn->c_net =get_net (net); +write_pnet (&conn->c_net, net); }#define RDS_FLAG_CONG_BITMAP 0x01
net/rds/tcp.c +2 -2
@@ -528,7 +528,7 @@ static void rds_tcp_kill_sock(struct netrds_tcp_listen_stop (lsock, &rtn->rds_tcp_accept_w);spin_lock_irq (&rds_tcp_conn_lock);list_for_each_entry_safe (tc, _tc, &rds_tcp_conn_list, t_tcp_node) { -struct net *c_net = tc->t_cpath->cp_conn->c_net; +struct net *c_net =read_pnet (&tc->t_cpath->cp_conn->c_net);if (net != c_net || !tc->t_sock)continue ;
@@ -587,7 +587,7 @@ static void rds_tcp_sysctl_reset(structspin_lock_irq (&rds_tcp_conn_lock);list_for_each_entry_safe (tc, _tc, &rds_tcp_conn_list, t_tcp_node) { -struct net *c_net = tc->t_cpath->cp_conn->c_net; +struct net *c_net =read_pnet (&tc->t_cpath->cp_conn->c_net);if (net != c_net || !tc->t_sock)continue ;
Greg Kroah-Hartman
maintainerPATCH 20/45 rds: tcp: atomically purge entries from rds_tcp_conn_list during netns delete
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sowmini Varadhan <[email protected]>
commit f10b4cff98c6977668434fbf5dd58695eeca2897 upstream.
The rds_tcp_kill_sock() function parses the rds_tcp_conn_list to find the rds_connection entries marked for deletion as part of the netns deletion under the protection of the rds_tcp_conn_lock. Since the rds_tcp_conn_list tracks rds_tcp_connections (which have a 1:1 mapping with rds_conn_path), multiple tc entries in the rds_tcp_conn_list will map to a single rds_connection, and will be deleted as part of the rds_conn_destroy() operation that is done outside the rds_tcp_conn_lock.
The rds_tcp_conn_list traversal done under the protection of rds_tcp_conn_lock should not leave any doomed tc entries in the list after the rds_tcp_conn_lock is released, else another concurrently executiong netns delete (for a differnt netns) thread may trip on these entries.
--- net/rds/tcp.c | 9 +++++++-- net/rds/tcp.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-)
net/rds/tcp.c +7 -2
@@ -307,7 +307,8 @@ static void rds_tcp_conn_free(void *arg)rdsdebug ("freeing tc %p\n" , tc);spin_lock_irqsave (&rds_tcp_conn_lock, flags); -list_del (&tc->t_tcp_node); +if (!tc->t_tcp_node_detached) +list_del (&tc->t_tcp_node);spin_unlock_irqrestore (&rds_tcp_conn_lock, flags);kmem_cache_free (rds_tcp_conn_slab, tc);
@@ -532,8 +533,12 @@ static void rds_tcp_kill_sock(struct netif (net != c_net || !tc->t_sock)continue ; -if (!list_has_conn (&tmp_list, tc->t_cpath->cp_conn)) +if (!list_has_conn (&tmp_list, tc->t_cpath->cp_conn)) {list_move_tail (&tc->t_tcp_node, &tmp_list); + }else { +list_del (&tc->t_tcp_node); + tc->t_tcp_node_detached = true; + } }spin_unlock_irq (&rds_tcp_conn_lock);list_for_each_entry_safe (tc, _tc, &tmp_list, t_tcp_node) {
net/rds/tcp.h +1 -0
@@ -12,6 +12,7 @@ struct rds_tcp_incoming {struct rds_tcp_connection {struct list_head t_tcp_node; +bool t_tcp_node_detached;struct rds_conn_path *t_cpath;/* t_conn_path_lock synchronizes the connection establishment between * rds_tcp_accept_one and rds_tcp_conn_path_connect
Greg Kroah-Hartman
maintainerPATCH 21/45 net: avoid skb_warn_bad_offload on IS_ERR
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
commit 8d74e9f88d65af8bb2e095aff506aa6eac755ada upstream.
skb_warn_bad_offload warns when packets enter the GSO stack that require skb_checksum_help or vice versa. Do not warn on arbitrary bad packets. Packet sockets can craft many. Syzkaller was able to demonstrate another one with eth_type games.
In particular, suppress the warning when segmentation returns an error, which is for reasons other than checksum offload.
See also commit 36c92474498a ("net: WARN if skb_checksum_help() is called on skb requiring segmentation") for context on this warning.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -2815,7 +2815,7 @@ struct sk_buff *__skb_gso_segment(struct segs =skb_mac_gso_segment (skb, features); -if (unlikely (skb_needs_check (skb, tx_path))) +if (unlikely (skb_needs_check (skb, tx_path) && !IS_ERR (segs)))skb_warn_bad_offload (skb);return segs;
Greg Kroah-Hartman
maintainerPATCH 22/45 net_sched: gen_estimator: fix lockdep splat
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 40ca54e3a686f13117f3de0c443f8026dadf7c44 upstream.
syzbot reported a lockdep splat in gen_new_estimator() / est_fetch_counters() when attempting to lock est->stats_lock.
Since est_fetch_counters() is called from BH context from timer interrupt, we need to block BH as well when calling it from process context.
Most qdiscs use per cpu counters and are immune to the problem, but net/sched/act_api.c and net/netfilter/xt_RATEEST.c are using a spinlock to protect their data. They both call gen_new_estimator() while object is created and not yet alive, so this bug could not trigger a deadlock, only a lockdep splat.
--- net/core/gen_estimator.c | 4 ++++ 1 file changed, 4 insertions(+)
net/core/gen_estimator.c +4 -0
@@ -159,7 +159,11 @@ int gen_new_estimator(struct gnet_stats_ est->intvl_log = intvl_log; est->cpu_bstats = cpu_bstats; +if (stats_lock) +local_bh_disable ();est_fetch_counters (est, &b); +if (stats_lock) +local_bh_enable (); est->last_bytes = b.bytes; est->last_packets = b.packets; old =rcu_dereference_protected (*rate_est,1 );
Greg Kroah-Hartman
maintainerPATCH 23/45 soc: qcom: rmtfs_mem: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jesse Chan <[email protected]>
commit 3b229bdb54cc83061b4b7840e3532316cb1ac7ce upstream.
This change resolves a new compile-time warning
when built as a loadable module:
WARNING: modpost: missing MODULE_LICENSE() in drivers/soc/qcom/rmtfs_mem.o see include/linux/module.h for more information
This adds the license as "GPL v2", which matches the header of the file.
MODULE_DESCRIPTION and MODULE_AUTHOR are also added.
--- drivers/soc/qcom/rmtfs_mem.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/soc/qcom/rmtfs_mem.c +4 -0
@@ -267,3 +267,7 @@ static void qcom_rmtfs_mem_exit(void)unregister_chrdev_region (qcom_rmtfs_mem_major,QCOM_RMTFS_MEM_DEV_MAX ); }module_exit (qcom_rmtfs_mem_exit); + +MODULE_AUTHOR ("Linaro Ltd" ); +MODULE_DESCRIPTION ("Qualcomm Remote Filesystem memory driver" ); +MODULE_LICENSE ("GPL v2" );
Greg Kroah-Hartman
maintainerPATCH 24/45 ASoC: ux500: add MODULE_LICENSE tag
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 1783c9d7cb7bc3181b9271665959b87280d98d8e upstream.
This adds MODULE_LICENSE/AUTHOR/DESCRIPTION tags to the ux500 platform drivers, to avoid these build warnings:
WARNING: modpost: missing MODULE_LICENSE() in sound/soc/ux500/snd-soc-ux500-plat-dma.o
WARNING: modpost: missing MODULE_LICENSE() in sound/soc/ux500/snd-soc-ux500-mach-mop500.o
The company no longer exists, so the email addresses of the authors don't work any more, but I've added them anyway for consistency.
--- sound/soc/ux500/mop500.c | 4 ++++ sound/soc/ux500/ux500_pcm.c | 5 +++++ 2 files changed, 9 insertions(+)
sound/soc/ux500/mop500.c +4 -0
@@ -163,3 +163,7 @@ static struct platform_driver snd_soc_mo };module_platform_driver (snd_soc_mop500_driver); + +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("ASoC MOP500 board driver" ); +MODULE_AUTHOR ("Ola Lilja" );
sound/soc/ux500/ux500_pcm.c +5 -0
@@ -165,3 +165,8 @@ int ux500_pcm_unregister_platform(structreturn 0 ; }EXPORT_SYMBOL_GPL (ux500_pcm_unregister_platform); + +MODULE_AUTHOR ("Ola Lilja" ); +MODULE_AUTHOR ("Roger Nilsson" ); +MODULE_DESCRIPTION ("ASoC UX500 driver" ); +MODULE_LICENSE ("GPL v2" );
Greg Kroah-Hartman
maintainerPATCH 25/45 video: fbdev/mmp: add MODULE_LICENSE
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit c1530ac5a3ce93a1f02adabc4508b5fbf862dfe2 upstream.
Kbuild complains about the lack of a license tag in this driver:
WARNING: modpost: missing MODULE_LICENSE() in drivers/video/fbdev/mmp/mmp_disp.o
This adds the license, author and description tags.
--- drivers/video/fbdev/mmp/core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/video/fbdev/mmp/core.c +5 -0
@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/export.h> +#include <linux/module.h> #include <video/mmp_disp.h> static struct mmp_overlay *path_get_overlay(struct mmp_path *path,
@@ -249,3 +250,7 @@ void mmp_unregister_path(struct mmp_pathmutex_unlock (&disp_lock); }EXPORT_SYMBOL_GPL (mmp_unregister_path); + +MODULE_AUTHOR ("Zhou Zhu <[email protected]>" ); +MODULE_DESCRIPTION ("Marvell MMP display framework" ); +MODULE_LICENSE ("GPL" );
Greg Kroah-Hartman
maintainerPATCH 26/45 ARM: 8743/1: bL_switcher: add MODULE_LICENSE tag
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit a21b4c10c7bf5b58112afa20d6fa829e8d74e3e6 upstream.
Without this tag, we get a build warning:
WARNING: modpost: missing MODULE_LICENSE() in arch/arm/common/bL_switcher_dummy_if.o
For completeness, I'm also adding author and description fields.
--- arch/arm/common/bL_switcher_dummy_if.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/common/bL_switcher_dummy_if.c +4 -0
@@ -57,3 +57,7 @@ static struct miscdevice bL_switcher_dev &bL_switcher_fops };module_misc_device (bL_switcher_device); + +MODULE_AUTHOR ("Nicolas Pitre <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("big.LITTLE switcher dummy user interface" );
Greg Kroah-Hartman
maintainerPATCH 27/45 arm64: dts: add #cooling-cells to CPU nodes
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit acbf76ee05067c3942852019993f7beb69a0f45f upstream.
dtc complains about the lack of #coolin-cells properties for the CPU nodes that are referred to as "cooling-device":
arch/arm64/boot/dts/mediatek/mt8173-evb.dtb: Warning (cooling_device_property): Missing property '#cooling-cells' in node /cpus/cpu@0 or bad phandle (referred from /thermal-zones/cpu_thermal/cooling-maps/map@0:cooling-device[0]) arch/arm64/boot/dts/mediatek/mt8173-evb.dtb: Warning (cooling_device_property): Missing property '#cooling-cells' in node /cpus/cpu@100 or bad phandle (referred from /thermal-zones/cpu_thermal/cooling-maps/map@1:cooling-device[0])
Apparently this property must be '<2>' to match the binding.
--- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/mediatek/mt8173.dtsi +2 -0
@@ -81,6 +81,7 @@ reg = <0x000>; enable-method = "psci"; cpu-idle-states = <&CPU_SLEEP_0>; + #cooling-cells = <2>; }; cpu1: cpu@1 {
@@ -97,6 +98,7 @@ reg = <0x100>; enable-method = "psci"; cpu-idle-states = <&CPU_SLEEP_0>; + #cooling-cells = <2>; }; cpu3: cpu@101 {
Greg Kroah-Hartman
maintainerPATCH 28/45 dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit dfec091439bb2acf763497cfc58f2bdfc67c56b7 upstream.
After commit 3f34cfae1238 ("netfilter: on sockopt() acquire sock lock only in the required scope"), the caller of nf_{get/set}sockopt() must not hold any lock, but, in such changeset, I forgot to cope with DECnet.
This commit addresses the issue moving the nf call outside the lock, in the dn_{get,set}sockopt() with the same schema currently used by ipv4 and ipv6. Also moves the unhandled sockopts of the end of the main switch statements, to improve code readability.
--- net/decnet/af_decnet.c | 62 ++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 29 deletions(-)
net/decnet/af_decnet.c +33 -29
@@ -1338,6 +1338,12 @@ static int dn_setsockopt(struct socket *lock_sock (sk); err =__dn_setsockopt (sock, level, optname, optval, optlen,0 );release_sock (sk); +#ifdef CONFIG_NETFILTER +/* we need to exclude all possible ENOPROTOOPTs except default case */ +if (err == -ENOPROTOOPT && optname !=DSO_LINKINFO && + optname !=DSO_STREAM && optname !=DSO_SEQPACKET ) + err =nf_setsockopt (sk, PF_DECnet, optname, optval, optlen); +#endif return err; }
@@ -1445,15 +1451,6 @@ static int __dn_setsockopt(struct socketdn_nsp_send_disc (sk,0x38 ,0 , sk->sk_allocation);break ; -default : -#ifdef CONFIG_NETFILTER -return nf_setsockopt (sk, PF_DECnet, optname, optval, optlen); -#endif -case DSO_LINKINFO : -case DSO_STREAM : -case DSO_SEQPACKET : -return -ENOPROTOOPT ; -case DSO_MAXWINDOW :if (optlen !=sizeof (unsigned long ))return -EINVAL ;
@@ -1501,6 +1498,12 @@ static int __dn_setsockopt(struct socketreturn -EINVAL ; scp->info_loc = u.info;break ; + +case DSO_LINKINFO : +case DSO_STREAM : +case DSO_SEQPACKET : +default : +return -ENOPROTOOPT ; }return 0 ;
@@ -1514,6 +1517,20 @@ static int dn_getsockopt(struct socket *lock_sock (sk); err =__dn_getsockopt (sock, level, optname, optval, optlen,0 );release_sock (sk); +#ifdef CONFIG_NETFILTER +if (err == -ENOPROTOOPT && optname !=DSO_STREAM && + optname !=DSO_SEQPACKET && optname !=DSO_CONACCEPT && + optname !=DSO_CONREJECT ) { +int len; + +if (get_user (len, optlen)) +return -EFAULT ; + + err =nf_getsockopt (sk, PF_DECnet, optname, optval, &len); +if (err >=0 ) + err =put_user (len, optlen); + } +#endif return err; }
@@ -1579,26 +1596,6 @@ static int __dn_getsockopt(struct socket r_data = &link;break ; -default : -#ifdef CONFIG_NETFILTER - { -int ret, len; - -if (get_user (len, optlen)) -return -EFAULT ; - - ret =nf_getsockopt (sk, PF_DECnet, optname, optval, &len); -if (ret >=0 ) - ret =put_user (len, optlen); -return ret; - } -#endif -case DSO_STREAM : -case DSO_SEQPACKET : -case DSO_CONACCEPT : -case DSO_CONREJECT : -return -ENOPROTOOPT ; -case DSO_MAXWINDOW :if (r_len >sizeof (unsigned long )) r_len =sizeof (unsigned long );
@@ -1630,6 +1627,13 @@ static int __dn_getsockopt(struct socket r_len =sizeof (unsigned char ); r_data = &scp->info_rem;break ; + +case DSO_STREAM : +case DSO_SEQPACKET : +case DSO_CONACCEPT : +case DSO_CONREJECT : +default : +return -ENOPROTOOPT ; }if (r_data) {
Greg Kroah-Hartman
maintainerPATCH 29/45 ANDROID: binder: remove WARN() for redundant txn error
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Todd Kjos <[email protected]>
commit e46a3b3ba7509cb7fda0e07bc7c63a2cd90f579b upstream.
binder_send_failed_reply() is called when a synchronous transaction fails. It reports an error to the thread that is waiting for the completion. Given that the transaction is synchronous, there should never be more than 1 error response to that thread -- this was being asserted with a WARN().
However, when exercising the driver with syzbot tests, cases were observed where multiple "synchronous" requests were sent without waiting for responses, so it is possible that multiple errors would be reported to the thread. This testing was conducted with panic_on_warn set which forced the crash.
This is easily reproduced by sending back-to-back "synchronous" transactions without checking for any response (eg, set read_size to 0):
bwr.write_buffer = (uintptr_t)&bc1;
bwr.write_size = sizeof(bc1);
bwr.read_buffer = (uintptr_t)&br;
bwr.read_size = 0;
ioctl(fd, BINDER_WRITE_READ, &bwr);
sleep(1);
bwr2.write_buffer = (uintptr_t)&bc2;
bwr2.write_size = sizeof(bc2);
bwr2.read_buffer = (uintptr_t)&br;
bwr2.read_size = 0;
ioctl(fd, BINDER_WRITE_READ, &bwr2);
sleep(1);The first transaction is sent to the servicemanager and the reply fails because no VMA is set up by this client. After binder_send_failed_reply() is called, the BINDER_WORK_RETURN_ERROR is sitting on the thread's todo list since the read_size was 0 and the client is not waiting for a response.
The 2nd transaction is sent and the BINDER_WORK_RETURN_ERROR has not been consumed, so the thread's reply_error.cmd is still set (normally cleared when the BINDER_WORK_RETURN_ERROR is handled). Therefore when the servicemanager attempts to reply to the 2nd failed transaction, the error is already set and it triggers this warning.
This is a user error since it is not waiting for the synchronous transaction to complete. If it ever does check, it will see an error.
Changed the WARN() to a pr_warn().
--- drivers/android/binder.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/android/binder.c +8 -2
@@ -1933,8 +1933,14 @@ static void binder_send_failed_reply(str &target_thread->todo);wake_up_interruptible (&target_thread->wait); }else { -WARN (1 ,"Unexpected reply error: %u\n" , - target_thread->reply_error.cmd); +/* +* Cannot get here for normal operation, but +* we can if multiple synchronous transactions +* are sent without blocking for responses. +* Just ignore the 2nd error in this case. +*/ +pr_warn ("Unexpected reply error: %u\n" , + target_thread->reply_error.cmd); }binder_inner_proc_unlock (target_thread->proc);binder_thread_dec_tmpref (target_thread);
Greg Kroah-Hartman
maintainerPATCH 30/45 ANDROID: binder: synchronize_rcu() when using POLLFREE.
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martijn Coenen <[email protected]>
commit 5eeb2ca02a2f6084fc57ae5c244a38baab07033a upstream.
To prevent races with ep_remove_waitqueue() removing the waitqueue at the same time.
--- drivers/android/binder.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/android/binder.c +9 -0
@@ -4322,6 +4322,15 @@ static int binder_thread_release(structbinder_inner_proc_unlock (thread->proc); +/* +* This is needed to avoid races between wake_up_poll() above and +* and ep_remove_waitqueue() called for other reasons (eg the epoll file +* descriptor being closed); ep_remove_waitqueue() holds an RCU read +* lock, so we can be sure it's done after calling synchronize_rcu(). +*/ +if (thread->looper &BINDER_LOOPER_STATE_POLL ) +synchronize_rcu (); +if (send_reply)binder_send_failed_reply (send_reply,BR_DEAD_REPLY );binder_release_work (proc, &thread->todo);
Greg Kroah-Hartman
maintainerPATCH 31/45 staging: android: ashmem: Fix a race condition in pin ioctls
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
commit ce8a3a9e76d0193e2e8d74a06d275b3c324ca652 upstream.
ashmem_pin_unpin() reads asma->file and asma->size before taking the ashmem_mutex, so it can race with other operations that modify them.
Build-tested only.
--- drivers/staging/android/ashmem.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/staging/android/ashmem.c +11 -8
@@ -710,30 +710,32 @@ static int ashmem_pin_unpin(struct ashmesize_t pgstart, pgend;int ret = -EINVAL ; +mutex_lock (&ashmem_mutex); +if (unlikely (!asma->file)) -return -EINVAL ; + goto out_unlock; -if (unlikely (copy_from_user (&pin, p,sizeof (pin)))) -return -EFAULT ; +if (unlikely (copy_from_user (&pin, p,sizeof (pin)))) { + ret = -EFAULT ; + goto out_unlock; + }/* per custom, you can pass zero for len to mean "everything onward" */ if (!pin.len) pin.len =PAGE_ALIGN (asma->size) - pin.offset;if (unlikely ((pin.offset | pin.len) & ~PAGE_MASK )) -return -EINVAL ; + goto out_unlock;if (unlikely (((__u32)-1 ) - pin.offset < pin.len)) -return -EINVAL ; + goto out_unlock;if (unlikely (PAGE_ALIGN (asma->size) < pin.offset + pin.len)) -return -EINVAL ; + goto out_unlock; pgstart = pin.offset /PAGE_SIZE ; pgend = pgstart + (pin.len /PAGE_SIZE ) -1 ; -mutex_lock (&ashmem_mutex); -switch (cmd) {case ASHMEM_PIN : ret =ashmem_pin (asma, pgstart, pgend);
@@ -746,6 +748,7 @@ static int ashmem_pin_unpin(struct ashmebreak ; } +out_unlock:mutex_unlock (&ashmem_mutex);return ret;
Greg Kroah-Hartman
maintainerPATCH 32/45 binder: check for binder_thread allocation failure in binder_poll()
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit f88982679f54f75daa5b8eff3da72508f1e7422f upstream.
If the kzalloc() in binder_get_thread() fails, binder_poll() dereferences the resulting NULL pointer.
Fix it by returning POLLERR if the memory allocation failed.
This bug was found by syzkaller using fault injection.
--- drivers/android/binder.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/android/binder.c +2 -0
@@ -4346,6 +4346,8 @@ static unsigned int binder_poll(struct fbool wait_for_proc_work; thread =binder_get_thread (proc); +if (!thread) +return POLLERR ;binder_inner_proc_lock (thread->proc); thread->looper |=BINDER_LOOPER_STATE_POLL ;
Greg Kroah-Hartman
maintainerPATCH 33/45 binder: replace "%p" with "%pK"
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Todd Kjos <[email protected]>
commit 8ca86f1639ec5890d400fff9211aca22d0a392eb upstream.
The format specifier "%p" can leak kernel addresses. Use "%pK" instead. There were 4 remaining cases in binder.c.
--- drivers/android/binder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/android/binder.c +4 -4
@@ -2141,7 +2141,7 @@ static void binder_transaction_buffer_reint debug_id = buffer->debug_id;binder_debug (BINDER_DEBUG_TRANSACTION , -"%d buffer release %d, size %zd-%zd, failed at %p\n" , +"%d buffer release %d, size %zd-%zd, failed at %pK\n" , proc->pid, buffer->debug_id, buffer->data_size, buffer->offsets_size, failed_at);
@@ -3653,7 +3653,7 @@ static int binder_thread_write(struct bi } }binder_debug (BINDER_DEBUG_DEAD_BINDER , -"%d:%d BC_DEAD_BINDER_DONE %016llx found %p\n" , +"%d:%d BC_DEAD_BINDER_DONE %016llx found %pK\n" , proc->pid, thread->pid, (u64 )cookie, death);if (death ==NULL ) {
@@ -4991,7 +4991,7 @@ static void print_binder_transaction_ilospin_lock (&t->lock); to_proc = t->to_proc; seq_printf(m, - "%s %d: %p from %d:%d to %d:%d code %x flags %x pri %ld r%d", + "%s %d: %pK from %d:%d to %d:%d code %x flags %x pri %ld r%d", prefix, t->debug_id, t, t->from ? t->from->proc->pid : 0, t->from ? t->from->pid : 0,
@@ -5015,7 +5015,7 @@ static void print_binder_transaction_ilo }if (buffer->target_node)seq_printf (m," node %d" , buffer->target_node->debug_id); -seq_printf (m," size %zd:%zd data %p\n" , +seq_printf (m," size %zd:%zd data %pK\n" , buffer->data_size, buffer->offsets_size, buffer->data); }
Greg Kroah-Hartman
maintainerPATCH 34/45 staging: fsl-mc: fix build testing on x86
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 02b7b2844c2ffd3b614ec2b9293e8c7f041d60da upstream.
Selecting GENERIC_MSI_IRQ_DOMAIN on x86 causes a compile-time error in some configurations:
drivers/base/platform-msi.c:37:19: error: field 'arg' has incomplete type
On the other architectures, we are fine, but here we should have an additional dependency on X86_LOCAL_APIC so we can get the PCI_MSI_IRQ_DOMAIN symbol.
--- drivers/staging/fsl-mc/bus/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/fsl-mc/bus/Kconfig +1 -1
@@ -8,7 +8,7 @@ config FSL_MC_BUS bool "QorIQ DPAA2 fsl-mc bus driver" - depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC))) + depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86_LOCAL_APIC || PPC))) select GENERIC_MSI_IRQ_DOMAIN help Driver to enable the bus infrastructure for the QorIQ DPAA2
Greg Kroah-Hartman
maintainerPATCH 35/45 staging: iio: adc: ad7192: fix external frequency setting
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandru Ardelean <[email protected]>
commit e31b617d0a63c6558485aaa730fd162faa95a766 upstream.
The external clock frequency was set only when selecting the internal clock, which is fixed at 4.9152 Mhz.
This is incorrect, since it should be set when any of the external clock or crystal settings is selected.
Added range validation for the external (crystal/clock) frequency setting.
Valid values are between 2.4576 and 5.12 Mhz.
--- drivers/staging/iio/adc/ad7192.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/staging/iio/adc/ad7192.c +19 -8
@@ -141,6 +141,8 @@#define AD7192_GPOCON_P1DAT BIT(1)/* P1 state */ #define AD7192_GPOCON_P0DAT BIT(0)/* P0 state */ +#define AD7192_EXT_FREQ_MHZ_MIN 2457600 +#define AD7192_EXT_FREQ_MHZ_MAX 5120000#define AD7192_INT_FREQ_MHZ 4915200/* NOTE:
@@ -218,6 +220,12 @@ static int ad7192_calibrate_all(struct a ARRAY_SIZE(ad7192_calib_arr)); } +static inline bool ad7192_valid_external_frequency (u32 freq) +{ +return (freq >=AD7192_EXT_FREQ_MHZ_MIN && + freq <=AD7192_EXT_FREQ_MHZ_MAX ); +} +static int ad7192_setup (struct ad7192_state *st,const struct ad7192_platform_data *pdata) {
@@ -243,17 +251,20 @@ static int ad7192_setup(struct ad7192_st id);switch (pdata->clock_source_sel) { -case AD7192_CLK_EXT_MCLK1_2 : -case AD7192_CLK_EXT_MCLK2 : - st->mclk =AD7192_INT_FREQ_MHZ ; -break ;case AD7192_CLK_INT :case AD7192_CLK_INT_CO : -if (pdata->ext_clk_hz) - st->mclk = pdata->ext_clk_hz; -else - st->mclk =AD7192_INT_FREQ_MHZ ; + st->mclk =AD7192_INT_FREQ_MHZ ;break ; +case AD7192_CLK_EXT_MCLK1_2 : +case AD7192_CLK_EXT_MCLK2 : +if (ad7192_valid_external_frequency (pdata->ext_clk_hz)) { + st->mclk = pdata->ext_clk_hz; +break ; + } +dev_err (&st->sd.spi->dev,"Invalid frequency setting %u\n" , + pdata->ext_clk_hz); + ret = -EINVAL ; + goto out;default : ret = -EINVAL ; goto out;
Greg Kroah-Hartman
maintainerPATCH 36/45 staging: iio: ad5933: switch buffer mode to software
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandru Ardelean <[email protected]>
commit 7d2b8e6aaf9ee87910c2337e1c59bb5d3e3ba8c5 upstream.
Since commit 152a6a884ae1 ("staging:iio:accel:sca3000 move to hybrid hard / soft buffer design.")
the buffer mechanism has changed and the INDIO_BUFFER_HARDWARE flag has been unused.
Since commit 2d6ca60f3284 ("iio: Add a DMAengine framework based buffer")
the INDIO_BUFFER_HARDWARE flag has been re-purposed for DMA buffers.
This driver has lagged behind these changes, and in order for buffers to work, the INDIO_BUFFER_SOFTWARE needs to be used.
--- drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/iio/impedance-analyzer/ad5933.c +1 -3
@@ -648,8 +648,6 @@ static int ad5933_register_ring_funcs_an/* Ring buffer functions - here trigger setup related */ indio_dev->setup_ops = &ad5933_ring_setup_ops; - indio_dev->modes |=INDIO_BUFFER_HARDWARE ; -return 0 ; }
@@ -762,7 +760,7 @@ static int ad5933_probe(struct i2c_clien indio_dev->dev.parent = &client->dev; indio_dev->info = &ad5933_info; indio_dev->name = id->name; - indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->modes = (INDIO_BUFFER_SOFTWARE |INDIO_DIRECT_MODE ); indio_dev->channels = ad5933_channels; indio_dev->num_channels =ARRAY_SIZE (ad5933_channels);
Greg Kroah-Hartman
maintainerPATCH 37/45 xhci: Fix NULL pointer in xhci debugfs
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengjun Xing <[email protected]>
commit fa2dfd0ec22e0069c84dfae162972cbbc7c75488 upstream.
Commit dde634057da7 ("xhci: Fix use-after-free in xhci debugfs") causes a null pointer dereference while fixing xhci-debugfs usage of ring pointers that were freed during hibernate.
The fix passed addresses to ring pointers instead, but forgot to do this change for the xhci_ring_trb_show function.
The address of the ring pointer passed to xhci-debugfs was of a temporary ring pointer "new_ring" instead of the actual ring "ring" pointer. The temporary new_ring pointer will be set to NULL later causing the NULL pointer dereference.
This issue was seen when reading xhci related files in debugfs:
cat /sys/kernel/debug/usb/xhci/*/devices/*/ep*/trbs
[ 184.604861] BUG: unable to handle kernel NULL pointer dereference at (null) [ 184.613776] IP: xhci_ring_trb_show+0x3a/0x890 [ 184.618733] PGD 264193067 P4D 264193067 PUD 263238067 PMD 0 [ 184.625184] Oops: 0000 [#1] SMP [ 184.726410] RIP: 0010:xhci_ring_trb_show+0x3a/0x890 [ 184.731944] RSP: 0018:ffffba8243c0fd90 EFLAGS: 00010246 [ 184.737880] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 00000000000295d6 [ 184.746020] RDX: 00000000000295d5 RSI: 0000000000000001 RDI: ffff971a6418d400 [ 184.754121] RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 [ 184.762222] R10: ffff971a64c98a80 R11: ffff971a62a00e40 R12: ffff971a62a85500 [ 184.770325] R13: 0000000000020000 R14: ffff971a6418d400 R15: ffff971a6418d400 [ 184.778448] FS: 00007fe725a79700(0000) GS:ffff971a6ec00000(0000) knlGS:0000000000000000 [ 184.787644] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 184.794168] CR2: 0000000000000000 CR3: 000000025f365005 CR4: 00000000003606f0 [ 184.802318] Call Trace: [ 184.805094] ? seq_read+0x281/0x3b0 [ 184.809068] seq_read+0xeb/0x3b0 [ 184.812735] full_proxy_read+0x4d/0x70 [ 184.817007] __vfs_read+0x23/0x120 [ 184.820870] vfs_read+0x91/0x130 [ 184.824538] SyS_read+0x42/0x90 [ 184.828106] entry_SYSCALL_64_fastpath+0x1a/0x7d
--- drivers/usb/host/xhci-debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-debugfs.c +2 -2
@@ -211,7 +211,7 @@ static void xhci_ring_dump_segment(strucstatic int xhci_ring_trb_show (struct seq_file *s,void *unused) {int i; -struct xhci_ring *ring = s->private; +struct xhci_ring *ring = *(struct xhci_ring **)s->private;struct xhci_segment *seg = ring->first_seg;for (i =0 ; i < ring->num_segs; i++) {
@@ -387,7 +387,7 @@ void xhci_debugfs_create_endpoint(structsnprintf (epriv->name,sizeof (epriv->name),"ep%02d" , ep_index); epriv->root =xhci_debugfs_create_ring_dir (xhci, - &dev->eps[ep_index].new_ring, + &dev->eps[ep_index].ring, epriv->name, spriv->root); spriv->eps[ep_index] = epriv;
Greg Kroah-Hartman
maintainerPATCH 38/45 xhci: Fix xhci debugfs devices node disappearance after hibernation
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengjun Xing <[email protected]>
commit d91676717261578f429d3577dbe9154b26e8abf7 upstream.
During system resume from hibernation, xhci host is reset, all the nodes in devices folder are removed in xhci_mem_cleanup function. Later nodes in /sys/kernel/debug/usb/xhci/* are created again in function xhci_run, but the nodes already exist, so the nodes still keep the old ones, finally device nodes in xhci debugfs folder /sys/kernel/debug/usb/xhci/*/devices/* are disappeared.
This fix removed xhci debugfs nodes before the nodes are re-created, so all the nodes in xhci debugfs can be re-created successfully.
--- drivers/usb/host/xhci.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci.c +1 -0
@@ -1018,6 +1018,7 @@ int xhci_resume(struct xhci_hcd *xhci, bxhci_dbg (xhci,"cleaning up memory\n" );xhci_mem_cleanup (xhci); +xhci_debugfs_exit (xhci);xhci_dbg (xhci,"xhci_stop completed - status = %x\n" ,readl (&xhci->op_regs->status));
Greg Kroah-Hartman
maintainerPATCH 39/45 xhci: xhci debugfs device nodes werent removed after device plugged out
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengjun Xing <[email protected]>
commit 8c5a93ebf7ac56d47f879b3c7c2f8c83b40c2cdb upstream.
There is a bug after plugged out USB device, the device and its ep00 nodes are still kept, we need to remove the nodes in xhci_free_dev when USB device is plugged out.
--- drivers/usb/host/xhci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/usb/host/xhci.c +2 -4
@@ -3552,12 +3552,10 @@ static void xhci_free_dev(struct usb_hcd virt_dev->eps[i].ep_state &= ~EP_STOP_CMD_PENDING ;del_timer_sync (&virt_dev->eps[i].stop_cmd_timer); } - +xhci_debugfs_remove_slot (xhci, udev->slot_id); ret =xhci_disable_slot (xhci, udev->slot_id); -if (ret) { -xhci_debugfs_remove_slot (xhci, udev->slot_id); +if (ret)xhci_free_virt_device (xhci, udev->slot_id); - } }int xhci_disable_slot (struct xhci_hcd *xhci,u32 slot_id)
Greg Kroah-Hartman
maintainerPATCH 40/45 xhci: fix xhci debugfs errors in xhci_stop
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengjun Xing <[email protected]>
commit 11cd764dc9a030991880ad4d51db93918afa5822 upstream.
In function xhci_stop, xhci_debugfs_exit called before xhci_mem_cleanup. xhci_debugfs_exit removed the xhci debugfs root nodes, xhci_mem_cleanup called function xhci_free_virt_devices_depth_first which in turn called function xhci_debugfs_remove_slot.
Function xhci_debugfs_remove_slot removed the nodes for devices, the nodes folders are sub folder of xhci debugfs.
It is unreasonable to remove xhci debugfs root folder before xhci debugfs sub folder. Function xhci_mem_cleanup should be called before function xhci_debugfs_exit.
--- drivers/usb/host/xhci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/host/xhci.c +1 -2
@@ -652,8 +652,6 @@ static void xhci_stop(struct usb_hcd *hcreturn ; } -xhci_debugfs_exit (xhci); -spin_lock_irq (&xhci->lock); xhci->xhc_state |=XHCI_STATE_HALTED ; xhci->cmd_ring_state =CMD_RING_STATE_STOPPED ;
@@ -685,6 +683,7 @@ static void xhci_stop(struct usb_hcd *hcxhci_dbg_trace (xhci, trace_xhci_dbg_init,"cleaning up memory" );xhci_mem_cleanup (xhci); +xhci_debugfs_exit (xhci);xhci_dbg_trace (xhci, trace_xhci_dbg_init,"xhci_stop completed - status = %x" ,readl (&xhci->op_regs->status));
Greg Kroah-Hartman
maintainerPATCH 41/45 usbip: keep usbip_device sockfd state in sync with tcp_socket
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuah Khan <[email protected]>
commit 009f41aed4b3e11e6dc1e3c07377a10c20f1a5ed upstream.
Keep usbip_device sockfd state in sync with tcp_socket. When tcp_socket is reset to null, reset sockfd to -1 to keep it in sync.
--- drivers/usb/usbip/stub_dev.c | 3 +++ drivers/usb/usbip/vhci_hcd.c | 2 ++ 2 files changed, 5 insertions(+)
drivers/usb/usbip/stub_dev.c +3 -0
@@ -73,6 +73,7 @@ static ssize_t store_sockfd(struct devic goto err; sdev->ud.tcp_socket = socket; + sdev->ud.sockfd = sockfd;spin_unlock_irq (&sdev->ud.lock);
@@ -172,6 +173,7 @@ static void stub_shutdown_connection(strif (ud->tcp_socket) {sockfd_put (ud->tcp_socket); ud->tcp_socket =NULL ; + ud->sockfd =-1 ; }/* 3. free used data */
@@ -266,6 +268,7 @@ static struct stub_device *stub_device_a sdev->ud.status =SDEV_ST_AVAILABLE ;spin_lock_init (&sdev->ud.lock); sdev->ud.tcp_socket =NULL ; + sdev->ud.sockfd =-1 ;INIT_LIST_HEAD (&sdev->priv_init);INIT_LIST_HEAD (&sdev->priv_tx);
drivers/usb/usbip/vhci_hcd.c +2 -0
@@ -984,6 +984,7 @@ static void vhci_shutdown_connection(strif (vdev->ud.tcp_socket) {sockfd_put (vdev->ud.tcp_socket); vdev->ud.tcp_socket =NULL ; + vdev->ud.sockfd =-1 ; }pr_info ("release socket\n" );
@@ -1030,6 +1031,7 @@ static void vhci_device_reset(struct usbif (ud->tcp_socket) {sockfd_put (ud->tcp_socket); ud->tcp_socket =NULL ; + ud->sockfd =-1 ; } ud->status =VDEV_ST_NULL ;
Greg Kroah-Hartman
maintainerPATCH 42/45 crypto: s5p-sss - Fix kernel Oops in AES-ECB mode
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kamil Konieczny <[email protected]>
commit c927b080c67e3e97193c81fc1d27f4251bf4e036 upstream.
In AES-ECB mode crypt is done with key only, so any use of IV can cause kernel Oops. Use IV only in AES-CBC and AES-CTR.
--- drivers/crypto/s5p-sss.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/crypto/s5p-sss.c +9 -3
@@ -1926,15 +1926,21 @@ static void s5p_aes_crypt_start(struct suint32_t aes_control;unsigned long flags;int err; +u8 *iv; aes_control =SSS_AES_KEY_CHANGE_MODE ;if (mode &FLAGS_AES_DECRYPT ) aes_control |=SSS_AES_MODE_DECRYPT ; -if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CBC ) +if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CBC ) { aes_control |=SSS_AES_CHAIN_MODE_CBC ; -else if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CTR ) + iv = req->info; + }else if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CTR ) { aes_control |=SSS_AES_CHAIN_MODE_CTR ; + iv = req->info; + }else { + iv =NULL ;/* AES_ECB */ + }if (dev->ctx->keylen ==AES_KEYSIZE_192 ) aes_control |=SSS_AES_KEY_SIZE_192 ;
@@ -1965,7 +1971,7 @@ static void s5p_aes_crypt_start(struct s goto outdata_error;SSS_AES_WRITE (dev,AES_CONTROL , aes_control); -s5p_set_aes (dev, dev->ctx->aes_key, req->info, dev->ctx->keylen); +s5p_set_aes (dev, dev->ctx->aes_key, iv, dev->ctx->keylen);s5p_set_dma_indata (dev, dev->sg_src);s5p_set_dma_outdata (dev, dev->sg_dst);
Greg Kroah-Hartman
maintainerPATCH 43/45 mei: me: add cannon point device ids
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Usyskin <[email protected]>
commit f8f4aa68a8ae98ed79c8fee3488c38a2f5d2de8c upstream.
Add CNP LP and CNP H device ids for cannon lake
and coffee lake platforms.
--- drivers/misc/mei/hw-me-regs.h | 3 +++ drivers/misc/mei/pci-me.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/misc/mei/hw-me-regs.h +3 -0
@@ -132,6 +132,9 @@#define MEI_DEV_ID_KBP 0xA2BA/* Kaby Point */ #define MEI_DEV_ID_KBP_2 0xA2BB/* Kaby Point 2 */ +#define MEI_DEV_ID_CNP_LP 0x9DE0/* Cannon Point LP */ +#define MEI_DEV_ID_CNP_H 0xA360/* Cannon Point H */ +/* * MEI HW Section */
drivers/misc/mei/pci-me.c +3 -0
@@ -98,6 +98,9 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_LP, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH8_CFG)}, +/* required last entry */ {0, } };
Greg Kroah-Hartman
maintainerPATCH 44/45 mei: me: add cannon point device ids for 4th device
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Winkler <[email protected]>
commit 2a4ac172c2f257d28c47b90c9e381bec31edcc44 upstream.
Add cannon point device ids for 4th (itouch) device.
--- drivers/misc/mei/hw-me-regs.h | 2 ++ drivers/misc/mei/pci-me.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/misc/mei/hw-me-regs.h +2 -0
@@ -133,7 +133,9 @@#define MEI_DEV_ID_KBP_2 0xA2BB/* Kaby Point 2 */ #define MEI_DEV_ID_CNP_LP 0x9DE0/* Cannon Point LP */ +#define MEI_DEV_ID_CNP_LP_4 0x9DE4/* Cannon Point LP 4 (iTouch) */ #define MEI_DEV_ID_CNP_H 0xA360/* Cannon Point H */ +#define MEI_DEV_ID_CNP_H_4 0xA364/* Cannon Point H 4 (iTouch) */ /* * MEI HW Section
drivers/misc/mei/pci-me.c +2 -0
@@ -99,7 +99,9 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_LP, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_LP_4, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},/* required last entry */ {0, }
Greg Kroah-Hartman
maintainerPATCH 45/45 vmalloc: fix __GFP_HIGHMEM usage for vmalloc_32 on 32b systems
In reply to Greg Kroah-Hartman4.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Hocko <[email protected]>
commit 698d0831ba87b92ae10b15e8203cfd59f5a59a35 upstream.
Kai Heng Feng has noticed that BUG_ON(PageHighMem(pg)) triggers in drivers/media/common/saa7146/saa7146_core.c since 19809c2da28a ("mm,
vmalloc: use __GFP_HIGHMEM implicitly").
saa7146_vmalloc_build_pgtable uses vmalloc_32 and it is reasonable to expect that the resulting page is not in highmem. The above commit aimed to add __GFP_HIGHMEM only for those requests which do not specify any zone modifier gfp flag. vmalloc_32 relies on GFP_VMALLOC32 which should do the right thing. Except it has been missed that GFP_VMALLOC32 is an alias for GFP_KERNEL on 32b architectures. Thanks to Matthew to notice this.
Fix the problem by unconditionally setting GFP_DMA32 in GFP_VMALLOC32 for !64b arches (as a bailout). This should do the right thing and use ZONE_NORMAL which should be always below 4G on 32b systems.
Debugged by Matthew Wilcox.
--- mm/vmalloc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
mm/vmalloc.c +7 -3
@@ -1943,11 +1943,15 @@ void *vmalloc_exec(unsigned long size) }#if defined(CONFIG_64BIT ) && defined(CONFIG_ZONE_DMA32 ) -#define GFP_VMALLOC32 GFP_DMA32 | GFP_KERNEL +#define GFP_VMALLOC32 (GFP_DMA32 | GFP_KERNEL)#elif defined(CONFIG_64BIT ) && defined(CONFIG_ZONE_DMA ) -#define GFP_VMALLOC32 GFP_DMA | GFP_KERNEL +#define GFP_VMALLOC32 (GFP_DMA | GFP_KERNEL)#else -#define GFP_VMALLOC32 GFP_KERNEL +/* +* 64b systems should always have either DMA or DMA32 zones. For others +* GFP_DMA32 should do the right thing and use the normal zone. +*/ +#define GFP_VMALLOC32 GFP_DMA32 | GFP_KERNEL#endif /**
stable-rc/linux-4.15.y boot: 105 boots: 3 failed, 85 passed with 17 offline (v4.15.5-46-g82ca63fd5c32)
stable-rc/linux-4.15.y boot: 105 boots: 3 failed, 85 passed with 17 offline (v4.15.5-46-g82ca63fd5c32)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.15.y/kernel/v4.15.5-46-g82ca63fd5c32/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.15.y/kernel/v4.15.5-46-g82ca63fd5c32/
Tree: stable-rc
Branch: linux-4.15.y
Git Describe: v4.15.5-46-g82ca63fd5c32
Git Commit: 82ca63fd5c3280300c175fd372b9049c196d5676
Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 58 unique boards, 22 SoC families, 15 builds out of 185
Boot Regressions Detected:
arm:
exynos_defconfig:
exynos5800-peach-pi:
lab-collabora: new failure (last pass: v4.15.4)
arm64:
defconfig:
meson-gxbb-p200:
lab-baylibre-seattle: failing since 6 days (last pass: v4.15.3-204-g01be67fd216d - first fail: v4.15.4)
r8a7795-salvator-x:
lab-baylibre: failing since 1 day (last pass: v4.15.5 - first fail: v4.15.5-42-gf40984b50e73)Boot Failures Detected:
arm:
exynos_defconfig
exynos5800-peach-pi: 1 failed lab
arm64:
defconfig
meson-gxbb-p200: 1 failed lab
r8a7795-salvator-x: 1 failed lab
Offline Platforms:
arm:
exynos_defconfig:
exynos5410-odroidxu: 1 offline lab
exynos5422-odroidxu3: 1 offline lab
multi_v7_defconfig:
alpine-db: 1 offline lab
am335x-boneblack: 1 offline lab
at91-sama5d4_xplained: 1 offline lab
exynos5410-odroidxu: 1 offline lab
exynos5422-odroidxu3: 1 offline lab socfpga_cyclone5_de0_sockit: 1 offline lab
tegra124-jetson-tk1: 1 offline lab
sama5_defconfig:
at91-sama5d4_xplained: 1 offline lab
tegra_defconfig:
tegra124-jetson-tk1: 1 offline lab
bcm2835_defconfig:
bcm2835-rpi-b: 1 offline lab
omap2plus_defconfig:
am335x-boneblack: 1 offline lab
arm64:
defconfig:
apq8016-sbc: 1 offline lab
juno-r2: 1 offline lab
meson-gxbb-odroidc2: 1 offline lab
meson-gxl-s905d-p230: 1 offline lab
---
For more info write to <[email protected]>
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.15.6 release. There are 45 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 Sun Feb 25 17:06:43 UTC 2018. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 15 lines · Shuah Khan
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.15.6 release. There are 45 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 Sun Feb 25 17:06:43 UTC 2018. 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.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.15.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Thanks for testing all of these and letting me know.
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.15.6 release. There are 45 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 Sun Feb 25 17:06:43 UTC 2018. Anything received after that time might be too late.
For v4.15.5-46-g82ca63f:
Build results:
total: 147 pass: 147 fail: 0 Qemu test results: total: 126 pass: 126 fail: 0
Details are available at http://kerneltests.org/builders.
Guenter
Greg Kroah-Hartman
maintainerQuoted 10 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.15.6 release. There are 45 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 Sun Feb 25 17:06:43 UTC 2018. Anything received after that time might be too late.
Quoted 8 lines
For v4.15.5-46-g82ca63f:
Build results:
total: 147 pass: 147 fail: 0 Qemu test results: total: 126 pass: 126 fail: 0Details are available at http://kerneltests.org/builders.
Wonderful, thanks for testing all of these and letting me know.
greg k-h
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.15.6 release. There are 45 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.
Quoted 8 lines
Responses should be made by Sun Feb 25 17:06:43 UTC 2018. 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.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.15.y
and the diffstat can be found below.
Results from Linaro’s test farm.
No regressions on arm64, arm and x86_64.
Summary
------------------------------------------------------------------------
kernel: 4.15.6-rc1
git repo:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.15.y
git commit: 82ca63fd5c3280300c175fd372b9049c196d5676 git describe: v4.15.5-46-g82ca63fd5c32
Test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-4.15-oe/build/v4.15.5-46-g82ca63fd5c32
No regressions (compared to build v4.15.5-42-gf40984b50e73)
Boards, architectures and test suites:
-------------------------------------
hi6220-hikey - arm64
* boot - pass: 20,
* kselftest - pass: 57, skip: 9
* libhugetlbfs - pass: 90, skip: 1
* ltp-cap_bounds-tests - pass: 2,
* ltp-containers-tests - pass: 64, skip: 17
* ltp-fcntl-locktests-tests - pass: 2,
* ltp-filecaps-tests - pass: 2,
* ltp-fs-tests - pass: 61, skip: 2
* ltp-fs_bind-tests - pass: 2,
* ltp-fs_perms_simple-tests - pass: 19,
* ltp-fsx-tests - pass: 2,
* ltp-hugetlb-tests - pass: 21, skip: 1
* ltp-io-tests - pass: 3,
* ltp-ipc-tests - pass: 9,
* ltp-math-tests - pass: 11,
* ltp-nptl-tests - pass: 2,
* ltp-pty-tests - pass: 4,
* ltp-sched-tests - pass: 10, skip: 4
* ltp-securebits-tests - pass: 4,
* ltp-syscalls-tests - pass: 999, skip: 151
* ltp-timers-tests - pass: 12, skip: 1
juno-r2 - arm64
* boot - pass: 21,
* kselftest - pass: 56, skip: 10
* libhugetlbfs - pass: 90, skip: 1
* ltp-cap_bounds-tests - pass: 2,
* ltp-containers-tests - pass: 64, skip: 17
* ltp-fcntl-locktests-tests - pass: 2,
* ltp-filecaps-tests - pass: 2,
* ltp-fs-tests - pass: 61, skip: 2
* ltp-fs_bind-tests - pass: 2,
* ltp-fs_perms_simple-tests - pass: 19,
* ltp-fsx-tests - pass: 2,
* ltp-hugetlb-tests - pass: 22,
* ltp-io-tests - pass: 6,
* ltp-ipc-tests - pass: 9,
* ltp-math-tests - pass: 11,
* ltp-nptl-tests - pass: 2,
* ltp-pty-tests - pass: 4,
* ltp-sched-tests - pass: 10, skip: 4
* ltp-securebits-tests - pass: 4,
* ltp-syscalls-tests - pass: 1001, skip: 149
* ltp-timers-tests - pass: 12, skip: 1
x15 - arm
* boot - pass: 20,
* kselftest - pass: 53, skip: 12
* libhugetlbfs - pass: 87, skip: 1
* ltp-cap_bounds-tests - pass: 2,
* ltp-containers-tests - pass: 63, skip: 18
* ltp-fcntl-locktests-tests - pass: 2,
* ltp-filecaps-tests - pass: 2,
* ltp-fs-tests - pass: 61, skip: 2
* ltp-fs_bind-tests - pass: 2,
* ltp-fs_perms_simple-tests - pass: 19,
* ltp-fsx-tests - pass: 2,
* ltp-hugetlb-tests - pass: 20, skip: 2
* ltp-ipc-tests - pass: 9,
* ltp-math-tests - pass: 11,
* ltp-pty-tests - pass: 4,
* ltp-sched-tests - pass: 13, skip: 1
* ltp-securebits-tests - pass: 4,
* ltp-syscalls-tests - pass: 1053, skip: 97
* ltp-timers-tests - pass: 12, skip: 1
x86_64
* boot - pass: 20,
* kselftest - pass: 71, skip: 10
* libhugetlbfs - pass: 90, skip: 1
* ltp-cap_bounds-tests - pass: 2,
* ltp-containers-tests - pass: 64, skip: 17
* ltp-fcntl-locktests-tests - pass: 2,
* ltp-filecaps-tests - pass: 2,
* ltp-fs-tests - pass: 62, skip: 1
* ltp-fs_bind-tests - pass: 2,
* ltp-fs_perms_simple-tests - pass: 19,
* ltp-fsx-tests - pass: 2,
* ltp-hugetlb-tests - pass: 22,
* ltp-io-tests - pass: 3,
* ltp-ipc-tests - pass: 9,
* ltp-math-tests - pass: 11,
* ltp-nptl-tests - pass: 2,
* ltp-pty-tests - pass: 4,
* ltp-sched-tests - pass: 9, skip: 5
* ltp-securebits-tests - pass: 4,
* ltp-syscalls-tests - pass: 1031, skip: 119
* ltp-timers-tests - pass: 12, skip: 1
--
Linaro QA (beta)
https://qa-reports.linaro.org
Greg Kroah-Hartman
maintainerQuoted 9 lines · Dan Rue
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.15.6 release. There are 45 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 Sun Feb 25 17:06:43 UTC 2018. Anything received after that time might be too late.
Quoted 8 lines
Quoted 5 lines
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.15.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.15.y
and the diffstat can be found below.Results from Linaro’s test farm.
No regressions on arm64, arm andx86_64.
Great, thanks for testing all of these and letting me know.
greg k-h