From: Greg Kroah-Hartman Date: Wed, 12 May 2021 14:20:35 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.4.119~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d19ed50e80e7d6ffe4b5e94fcdfc86082c22a58;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch revert-net-sctp-fix-race-condition-in-sctp_destroy_sock.patch revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch sctp-delay-auto_asconf-init-until-binding-the-first-addr.patch --- diff --git a/queue-4.14/revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch b/queue-4.14/revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch new file mode 100644 index 00000000000..4d2f611e11c --- /dev/null +++ b/queue-4.14/revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch @@ -0,0 +1,32 @@ +From foo@baz Wed May 12 04:07:07 PM CEST 2021 +From: Quentin Perret +Date: Wed, 12 May 2021 12:30:23 +0000 +Subject: Revert "fdt: Properly handle "no-map" field in the memory region" +To: stable@vger.kernel.org +Cc: alexandre.torgue@foss.st.com, robh+dt@kernel.org, f.fainelli@gmail.com, ardb@kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org +Message-ID: <20210512123023.3286501-2-qperret@google.com> + +From: Quentin Perret + +This reverts commit 71bc5d496725f7f923904d2f41cd39e32c647fdf. +It is not really a fix, and the backport misses dependencies, which +breaks existing platforms. + +Reported-by: Alexandre TORGUE +Signed-off-by: Quentin Perret +Signed-off-by: Greg Kroah-Hartman +--- + drivers/of/fdt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -1213,7 +1213,7 @@ int __init __weak early_init_dt_reserve_ + phys_addr_t size, bool nomap) + { + if (nomap) +- return memblock_mark_nomap(base, size); ++ return memblock_remove(base, size); + return memblock_reserve(base, size); + } + diff --git a/queue-4.14/revert-net-sctp-fix-race-condition-in-sctp_destroy_sock.patch b/queue-4.14/revert-net-sctp-fix-race-condition-in-sctp_destroy_sock.patch new file mode 100644 index 00000000000..cfb2ae7781c --- /dev/null +++ b/queue-4.14/revert-net-sctp-fix-race-condition-in-sctp_destroy_sock.patch @@ -0,0 +1,80 @@ +From 01bfe5e8e428b475982a98a46cca5755726f3f7f Mon Sep 17 00:00:00 2001 +From: Xin Long +Date: Mon, 3 May 2021 05:11:41 +0800 +Subject: Revert "net/sctp: fix race condition in sctp_destroy_sock" + +From: Xin Long + +commit 01bfe5e8e428b475982a98a46cca5755726f3f7f upstream. + +This reverts commit b166a20b07382b8bc1dcee2a448715c9c2c81b5b. + +This one has to be reverted as it introduced a dead lock, as +syzbot reported: + + CPU0 CPU1 + ---- ---- + lock(&net->sctp.addr_wq_lock); + lock(slock-AF_INET6); + lock(&net->sctp.addr_wq_lock); + lock(slock-AF_INET6); + +CPU0 is the thread of sctp_addr_wq_timeout_handler(), and CPU1 +is that of sctp_close(). + +The original issue this commit fixed will be fixed in the next +patch. + +Reported-by: syzbot+959223586843e69a2674@syzkaller.appspotmail.com +Signed-off-by: Xin Long +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/sctp/socket.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/net/sctp/socket.c ++++ b/net/sctp/socket.c +@@ -1586,9 +1586,11 @@ static void sctp_close(struct sock *sk, + + /* Supposedly, no process has access to the socket, but + * the net layers still may. ++ * Also, sctp_destroy_sock() needs to be called with addr_wq_lock ++ * held and that should be grabbed before socket lock. + */ +- local_bh_disable(); +- bh_lock_sock(sk); ++ spin_lock_bh(&net->sctp.addr_wq_lock); ++ bh_lock_sock_nested(sk); + + /* Hold the sock, since sk_common_release() will put sock_put() + * and we have just a little more cleanup. +@@ -1597,7 +1599,7 @@ static void sctp_close(struct sock *sk, + sk_common_release(sk); + + bh_unlock_sock(sk); +- local_bh_enable(); ++ spin_unlock_bh(&net->sctp.addr_wq_lock); + + sock_put(sk); + +@@ -4447,6 +4449,9 @@ static int sctp_init_sock(struct sock *s + sk_sockets_allocated_inc(sk); + sock_prot_inuse_add(net, sk->sk_prot, 1); + ++ /* Nothing can fail after this block, otherwise ++ * sctp_destroy_sock() will be called without addr_wq_lock held ++ */ + if (net->sctp.default_auto_asconf) { + spin_lock(&sock_net(sk)->sctp.addr_wq_lock); + list_add_tail(&sp->auto_asconf_list, +@@ -4481,9 +4486,7 @@ static void sctp_destroy_sock(struct soc + + if (sp->do_auto_asconf) { + sp->do_auto_asconf = 0; +- spin_lock_bh(&sock_net(sk)->sctp.addr_wq_lock); + list_del(&sp->auto_asconf_list); +- spin_unlock_bh(&sock_net(sk)->sctp.addr_wq_lock); + } + sctp_endpoint_free(sp->ep); + local_bh_disable(); diff --git a/queue-4.14/revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch b/queue-4.14/revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch new file mode 100644 index 00000000000..33d95234498 --- /dev/null +++ b/queue-4.14/revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch @@ -0,0 +1,41 @@ +From foo@baz Wed May 12 04:07:07 PM CEST 2021 +From: Quentin Perret +Date: Wed, 12 May 2021 12:30:22 +0000 +Subject: Revert "of/fdt: Make sure no-map does not remove already reserved regions" +To: stable@vger.kernel.org +Cc: alexandre.torgue@foss.st.com, robh+dt@kernel.org, f.fainelli@gmail.com, ardb@kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org +Message-ID: <20210512123023.3286501-1-qperret@google.com> + +From: Quentin Perret + +This reverts commit 6793433fc8f263eaba1621d3724b6aeba511c6c5. +It is not really a fix, and the backport misses dependencies, which +breaks existing platforms. + +Reported-by: Alexandre TORGUE +Signed-off-by: Quentin Perret +Signed-off-by: Greg Kroah-Hartman +--- + drivers/of/fdt.c | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -1212,16 +1212,8 @@ int __init __weak early_init_dt_mark_hot + int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, + phys_addr_t size, bool nomap) + { +- if (nomap) { +- /* +- * If the memory is already reserved (by another region), we +- * should not allow it to be marked nomap. +- */ +- if (memblock_is_region_reserved(base, size)) +- return -EBUSY; +- ++ if (nomap) + return memblock_mark_nomap(base, size); +- } + return memblock_reserve(base, size); + } + diff --git a/queue-4.14/sctp-delay-auto_asconf-init-until-binding-the-first-addr.patch b/queue-4.14/sctp-delay-auto_asconf-init-until-binding-the-first-addr.patch new file mode 100644 index 00000000000..3f53b1dae28 --- /dev/null +++ b/queue-4.14/sctp-delay-auto_asconf-init-until-binding-the-first-addr.patch @@ -0,0 +1,103 @@ +From 34e5b01186858b36c4d7c87e1a025071e8e2401f Mon Sep 17 00:00:00 2001 +From: Xin Long +Date: Mon, 3 May 2021 05:11:42 +0800 +Subject: sctp: delay auto_asconf init until binding the first addr + +From: Xin Long + +commit 34e5b01186858b36c4d7c87e1a025071e8e2401f upstream. + +As Or Cohen described: + + If sctp_destroy_sock is called without sock_net(sk)->sctp.addr_wq_lock + held and sp->do_auto_asconf is true, then an element is removed + from the auto_asconf_splist without any proper locking. + + This can happen in the following functions: + 1. In sctp_accept, if sctp_sock_migrate fails. + 2. In inet_create or inet6_create, if there is a bpf program + attached to BPF_CGROUP_INET_SOCK_CREATE which denies + creation of the sctp socket. + +This patch is to fix it by moving the auto_asconf init out of +sctp_init_sock(), by which inet_create()/inet6_create() won't +need to operate it in sctp_destroy_sock() when calling +sk_common_release(). + +It also makes more sense to do auto_asconf init while binding the +first addr, as auto_asconf actually requires an ANY addr bind, +see it in sctp_addr_wq_timeout_handler(). + +This addresses CVE-2021-23133. + +Fixes: 610236587600 ("bpf: Add new cgroup attach type to enable sock modifications") +Reported-by: Or Cohen +Signed-off-by: Xin Long +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/sctp/socket.c | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +--- a/net/sctp/socket.c ++++ b/net/sctp/socket.c +@@ -369,6 +369,18 @@ static struct sctp_af *sctp_sockaddr_af( + return af; + } + ++static void sctp_auto_asconf_init(struct sctp_sock *sp) ++{ ++ struct net *net = sock_net(&sp->inet.sk); ++ ++ if (net->sctp.default_auto_asconf) { ++ spin_lock(&net->sctp.addr_wq_lock); ++ list_add_tail(&sp->auto_asconf_list, &net->sctp.auto_asconf_splist); ++ spin_unlock(&net->sctp.addr_wq_lock); ++ sp->do_auto_asconf = 1; ++ } ++} ++ + /* Bind a local address either to an endpoint or to an association. */ + static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) + { +@@ -431,8 +443,10 @@ static int sctp_do_bind(struct sock *sk, + } + + /* Refresh ephemeral port. */ +- if (!bp->port) ++ if (!bp->port) { + bp->port = inet_sk(sk)->inet_num; ++ sctp_auto_asconf_init(sp); ++ } + + /* Add the address to the bind address list. + * Use GFP_ATOMIC since BHs will be disabled. +@@ -4449,19 +4463,6 @@ static int sctp_init_sock(struct sock *s + sk_sockets_allocated_inc(sk); + sock_prot_inuse_add(net, sk->sk_prot, 1); + +- /* Nothing can fail after this block, otherwise +- * sctp_destroy_sock() will be called without addr_wq_lock held +- */ +- if (net->sctp.default_auto_asconf) { +- spin_lock(&sock_net(sk)->sctp.addr_wq_lock); +- list_add_tail(&sp->auto_asconf_list, +- &net->sctp.auto_asconf_splist); +- sp->do_auto_asconf = 1; +- spin_unlock(&sock_net(sk)->sctp.addr_wq_lock); +- } else { +- sp->do_auto_asconf = 0; +- } +- + local_bh_enable(); + + return 0; +@@ -8219,6 +8220,8 @@ static void sctp_sock_migrate(struct soc + sctp_bind_addr_dup(&newsp->ep->base.bind_addr, + &oldsp->ep->base.bind_addr, GFP_KERNEL); + ++ sctp_auto_asconf_init(newsp); ++ + /* Move any messages in the old socket's receive queue that are for the + * peeled off association to the new socket's receive queue. + */ diff --git a/queue-4.14/series b/queue-4.14/series index 9bd722acdab..0b000a4e935 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -132,12 +132,9 @@ alsa-hda-realtek-re-order-alc269-sony-quirk-table-entries.patch alsa-hda-realtek-re-order-alc269-lenovo-quirk-table-entries.patch alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch x86-cpu-initialize-msr_tsc_aux-if-rdtscp-or-rdpid-is-supported.patch -kvm-s390-vsie-correctly-handle-mvpg-when-in-vsie.patch kvm-s390-split-kvm_s390_logical_to_effective.patch kvm-s390-fix-guarded-storage-control-register-handling.patch -kvm-s390-vsie-fix-mvpg-handling-for-prefixing-and-mso.patch kvm-s390-split-kvm_s390_real_to_abs.patch -kvm-s390-extend-kvm_s390_shadow_fault-to-return-entry-pointer.patch usb-gadget-pch_udc-revert-d3cb25a12138-completely.patch memory-gpmc-fix-out-of-bounds-read-and-dereference-o.patch arm-dts-exynos-correct-pmic-interrupt-trigger-level-.patch @@ -230,3 +227,7 @@ net-emac-emac-mac-fix-a-use-after-free-in-emac_mac_t.patch net-nfc-digital-fix-a-double-free-in-digital_tg_recv.patch kfifo-fix-ternary-sign-extension-bugs.patch smp-fix-smp_call_function_single_async-prototype.patch +revert-net-sctp-fix-race-condition-in-sctp_destroy_sock.patch +sctp-delay-auto_asconf-init-until-binding-the-first-addr.patch +revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch +revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch