From: Greg Kroah-Hartman Date: Sat, 7 Oct 2023 12:35:57 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.14.327~59 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abfaa6910ad0312b711689fc1b61cf22947f136f;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: btrfs-reject-unknown-mount-options-early.patch net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch wifi-mwifiex-fix-tlv_buf_left-calculation.patch --- diff --git a/queue-4.19/btrfs-reject-unknown-mount-options-early.patch b/queue-4.19/btrfs-reject-unknown-mount-options-early.patch new file mode 100644 index 00000000000..bef0f3a604a --- /dev/null +++ b/queue-4.19/btrfs-reject-unknown-mount-options-early.patch @@ -0,0 +1,55 @@ +From 5f521494cc73520ffac18ede0758883b9aedd018 Mon Sep 17 00:00:00 2001 +From: Qu Wenruo +Date: Wed, 27 Sep 2023 10:43:15 +0930 +Subject: btrfs: reject unknown mount options early + +From: Qu Wenruo + +commit 5f521494cc73520ffac18ede0758883b9aedd018 upstream. + +[BUG] +The following script would allow invalid mount options to be specified +(although such invalid options would just be ignored): + + # mkfs.btrfs -f $dev + # mount $dev $mnt1 <<< Successful mount expected + # mount $dev $mnt2 -o junk <<< Failed mount expected + # echo $? + 0 + +[CAUSE] +For the 2nd mount, since the fs is already mounted, we won't go through +open_ctree() thus no btrfs_parse_options(), but only through +btrfs_parse_subvol_options(). + +However we do not treat unrecognized options from valid but irrelevant +options, thus those invalid options would just be ignored by +btrfs_parse_subvol_options(). + +[FIX] +Add the handling for Opt_err to handle invalid options and error out, +while still ignore other valid options inside btrfs_parse_subvol_options(). + +Reported-by: Anand Jain +CC: stable@vger.kernel.org # 4.14+ +Signed-off-by: Qu Wenruo +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/super.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/fs/btrfs/super.c ++++ b/fs/btrfs/super.c +@@ -991,6 +991,10 @@ static int btrfs_parse_subvol_options(co + case Opt_subvolrootid: + pr_warn("BTRFS: 'subvolrootid' mount option is deprecated and has no effect\n"); + break; ++ case Opt_err: ++ btrfs_err(NULL, "unrecognized mount option '%s'", p); ++ error = -EINVAL; ++ goto out; + default: + break; + } diff --git a/queue-4.19/net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch b/queue-4.19/net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch new file mode 100644 index 00000000000..c839e5b3144 --- /dev/null +++ b/queue-4.19/net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch @@ -0,0 +1,52 @@ +From 26297b4ce1ce4ea40bc9a48ec99f45da3f64d2e2 Mon Sep 17 00:00:00 2001 +From: Jordan Rife +Date: Thu, 21 Sep 2023 18:46:40 -0500 +Subject: net: replace calls to sock->ops->connect() with kernel_connect() + +From: Jordan Rife + +commit 26297b4ce1ce4ea40bc9a48ec99f45da3f64d2e2 upstream. + +commit 0bdf399342c5 ("net: Avoid address overwrite in kernel_connect") +ensured that kernel_connect() will not overwrite the address parameter +in cases where BPF connect hooks perform an address rewrite. This change +replaces direct calls to sock->ops->connect() in net with kernel_connect() +to make these call safe. + +Link: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/ +Fixes: d74bad4e74ee ("bpf: Hooks for sys_connect") +Cc: stable@vger.kernel.org +Reviewed-by: Willem de Bruijn +Signed-off-by: Jordan Rife +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- + net/rds/tcp_connect.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/net/netfilter/ipvs/ip_vs_sync.c ++++ b/net/netfilter/ipvs/ip_vs_sync.c +@@ -1510,8 +1510,8 @@ static int make_send_sock(struct netns_i + } + + get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->mcfg, id); +- result = sock->ops->connect(sock, (struct sockaddr *) &mcast_addr, +- salen, 0); ++ result = kernel_connect(sock, (struct sockaddr *)&mcast_addr, ++ salen, 0); + if (result < 0) { + pr_err("Error connecting to the multicast addr\n"); + goto error; +--- a/net/rds/tcp_connect.c ++++ b/net/rds/tcp_connect.c +@@ -169,7 +169,7 @@ int rds_tcp_conn_path_connect(struct rds + * own the socket + */ + rds_tcp_set_callbacks(sock, cp); +- ret = sock->ops->connect(sock, addr, addrlen, O_NONBLOCK); ++ ret = kernel_connect(sock, addr, addrlen, O_NONBLOCK); + + rdsdebug("connect to address %pI6c returned %d\n", &conn->c_faddr, ret); + if (ret == -EINPROGRESS) diff --git a/queue-4.19/qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch b/queue-4.19/qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch new file mode 100644 index 00000000000..723bb117fe1 --- /dev/null +++ b/queue-4.19/qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch @@ -0,0 +1,116 @@ +From eea03d18af9c44235865a4bc9bec4d780ef6cf21 Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Sat, 23 Sep 2023 19:15:59 -0600 +Subject: qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info + +From: Gustavo A. R. Silva + +commit eea03d18af9c44235865a4bc9bec4d780ef6cf21 upstream. + +The flexible structure (a structure that contains a flexible-array member +at the end) `qed_ll2_tx_packet` is nested within the second layer of +`struct qed_ll2_info`: + +struct qed_ll2_tx_packet { + ... + /* Flexible Array of bds_set determined by max_bds_per_packet */ + struct { + struct core_tx_bd *txq_bd; + dma_addr_t tx_frag; + u16 frag_len; + } bds_set[]; +}; + +struct qed_ll2_tx_queue { + ... + struct qed_ll2_tx_packet cur_completing_packet; +}; + +struct qed_ll2_info { + ... + struct qed_ll2_tx_queue tx_queue; + struct qed_ll2_cbs cbs; +}; + +The problem is that member `cbs` in `struct qed_ll2_info` is placed just +after an object of type `struct qed_ll2_tx_queue`, which is in itself +an implicit flexible structure, which by definition ends in a flexible +array member, in this case `bds_set`. This causes an undefined behavior +bug at run-time when dynamic memory is allocated for `bds_set`, which +could lead to a serious issue if `cbs` in `struct qed_ll2_info` is +overwritten by the contents of `bds_set`. Notice that the type of `cbs` +is a structure full of function pointers (and a cookie :) ): + +include/linux/qed/qed_ll2_if.h: +107 typedef +108 void (*qed_ll2_complete_rx_packet_cb)(void *cxt, +109 struct qed_ll2_comp_rx_data *data); +110 +111 typedef +112 void (*qed_ll2_release_rx_packet_cb)(void *cxt, +113 u8 connection_handle, +114 void *cookie, +115 dma_addr_t rx_buf_addr, +116 bool b_last_packet); +117 +118 typedef +119 void (*qed_ll2_complete_tx_packet_cb)(void *cxt, +120 u8 connection_handle, +121 void *cookie, +122 dma_addr_t first_frag_addr, +123 bool b_last_fragment, +124 bool b_last_packet); +125 +126 typedef +127 void (*qed_ll2_release_tx_packet_cb)(void *cxt, +128 u8 connection_handle, +129 void *cookie, +130 dma_addr_t first_frag_addr, +131 bool b_last_fragment, bool b_last_packet); +132 +133 typedef +134 void (*qed_ll2_slowpath_cb)(void *cxt, u8 connection_handle, +135 u32 opaque_data_0, u32 opaque_data_1); +136 +137 struct qed_ll2_cbs { +138 qed_ll2_complete_rx_packet_cb rx_comp_cb; +139 qed_ll2_release_rx_packet_cb rx_release_cb; +140 qed_ll2_complete_tx_packet_cb tx_comp_cb; +141 qed_ll2_release_tx_packet_cb tx_release_cb; +142 qed_ll2_slowpath_cb slowpath_cb; +143 void *cookie; +144 }; + +Fix this by moving the declaration of `cbs` to the middle of its +containing structure `qed_ll2_info`, preventing it from being +overwritten by the contents of `bds_set` at run-time. + +This bug was introduced in 2017, when `bds_set` was converted to a +one-element array, and started to be used as a Variable Length Object +(VLO) at run-time. + +Fixes: f5823fe6897c ("qed: Add ll2 option to limit the number of bds per packet") +Cc: stable@vger.kernel.org +Signed-off-by: Gustavo A. R. Silva +Reviewed-by: Kees Cook +Reviewed-by: Simon Horman +Link: https://lore.kernel.org/r/ZQ+Nz8DfPg56pIzr@work +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.h ++++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.h +@@ -122,9 +122,9 @@ struct qed_ll2_info { + enum core_tx_dest tx_dest; + u8 tx_stats_en; + bool main_func_queue; ++ struct qed_ll2_cbs cbs; + struct qed_ll2_rx_queue rx_queue; + struct qed_ll2_tx_queue tx_queue; +- struct qed_ll2_cbs cbs; + }; + + /** diff --git a/queue-4.19/scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch b/queue-4.19/scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch new file mode 100644 index 00000000000..38b830e1072 --- /dev/null +++ b/queue-4.19/scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch @@ -0,0 +1,64 @@ +From b481f644d9174670b385c3a699617052cd2a79d3 Mon Sep 17 00:00:00 2001 +From: Dinghao Liu +Date: Sat, 23 Sep 2023 18:37:23 +0800 +Subject: scsi: zfcp: Fix a double put in zfcp_port_enqueue() + +From: Dinghao Liu + +commit b481f644d9174670b385c3a699617052cd2a79d3 upstream. + +When device_register() fails, zfcp_port_release() will be called after +put_device(). As a result, zfcp_ccw_adapter_put() will be called twice: one +in zfcp_port_release() and one in the error path after device_register(). +So the reference on the adapter object is doubly put, which may lead to a +premature free. Fix this by adjusting the error tag after +device_register(). + +Fixes: f3450c7b9172 ("[SCSI] zfcp: Replace local reference counting with common kref") +Signed-off-by: Dinghao Liu +Link: https://lore.kernel.org/r/20230923103723.10320-1-dinghao.liu@zju.edu.cn +Acked-by: Benjamin Block +Cc: stable@vger.kernel.org # v2.6.33+ +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/s390/scsi/zfcp_aux.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/drivers/s390/scsi/zfcp_aux.c ++++ b/drivers/s390/scsi/zfcp_aux.c +@@ -493,12 +493,12 @@ struct zfcp_port *zfcp_port_enqueue(stru + if (port) { + put_device(&port->dev); + retval = -EEXIST; +- goto err_out; ++ goto err_put; + } + + port = kzalloc(sizeof(struct zfcp_port), GFP_KERNEL); + if (!port) +- goto err_out; ++ goto err_put; + + rwlock_init(&port->unit_list_lock); + INIT_LIST_HEAD(&port->unit_list); +@@ -521,7 +521,7 @@ struct zfcp_port *zfcp_port_enqueue(stru + + if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) { + kfree(port); +- goto err_out; ++ goto err_put; + } + retval = -EINVAL; + +@@ -538,8 +538,9 @@ struct zfcp_port *zfcp_port_enqueue(stru + + return port; + +-err_out: ++err_put: + zfcp_ccw_adapter_put(adapter); ++err_out: + return ERR_PTR(retval); + } + diff --git a/queue-4.19/series b/queue-4.19/series index 0b06fc6cc6d..a12423c6a4d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -69,3 +69,8 @@ ata-libata-disallow-dev-initiated-lpm-transitions-to-unsupported-states.patch revert-drivers-core-use-sysfs_emit-and-sysfs_emit_at-for-show-device-...-functions.patch media-dvb-symbol-fixup-for-dvb_attach-again.patch revert-pci-qcom-disable-write-access-to-read-only-registers-for-ip-v2.3.3.patch +scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch +qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch +wifi-mwifiex-fix-tlv_buf_left-calculation.patch +net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch +btrfs-reject-unknown-mount-options-early.patch diff --git a/queue-4.19/wifi-mwifiex-fix-tlv_buf_left-calculation.patch b/queue-4.19/wifi-mwifiex-fix-tlv_buf_left-calculation.patch new file mode 100644 index 00000000000..8e547ff6301 --- /dev/null +++ b/queue-4.19/wifi-mwifiex-fix-tlv_buf_left-calculation.patch @@ -0,0 +1,103 @@ +From eec679e4ac5f47507774956fb3479c206e761af7 Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Thu, 24 Aug 2023 21:06:51 -0600 +Subject: wifi: mwifiex: Fix tlv_buf_left calculation + +From: Gustavo A. R. Silva + +commit eec679e4ac5f47507774956fb3479c206e761af7 upstream. + +In a TLV encoding scheme, the Length part represents the length after +the header containing the values for type and length. In this case, +`tlv_len` should be: + +tlv_len == (sizeof(*tlv_rxba) - 1) - sizeof(tlv_rxba->header) + tlv_bitmap_len + +Notice that the `- 1` accounts for the one-element array `bitmap`, which +1-byte size is already included in `sizeof(*tlv_rxba)`. + +So, if the above is correct, there is a double-counting of some members +in `struct mwifiex_ie_types_rxba_sync`, when `tlv_buf_left` and `tmp` +are calculated: + +968 tlv_buf_left -= (sizeof(*tlv_rxba) + tlv_len); +969 tmp = (u8 *)tlv_rxba + tlv_len + sizeof(*tlv_rxba); + +in specific, members: + +drivers/net/wireless/marvell/mwifiex/fw.h:777 + 777 u8 mac[ETH_ALEN]; + 778 u8 tid; + 779 u8 reserved; + 780 __le16 seq_num; + 781 __le16 bitmap_len; + +This is clearly wrong, and affects the subsequent decoding of data in +`event_buf` through `tlv_rxba`: + +970 tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp; + +Fix this by using `sizeof(tlv_rxba->header)` instead of `sizeof(*tlv_rxba)` +in the calculation of `tlv_buf_left` and `tmp`. + +This results in the following binary differences before/after changes: + +| drivers/net/wireless/marvell/mwifiex/11n_rxreorder.o +| @@ -4698,11 +4698,11 @@ +| drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:968 +| tlv_buf_left -= (sizeof(tlv_rxba->header) + tlv_len); +| - 1da7: lea -0x11(%rbx),%edx +| + 1da7: lea -0x4(%rbx),%edx +| 1daa: movzwl %bp,%eax +| drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:969 +| tmp = (u8 *)tlv_rxba + sizeof(tlv_rxba->header) + tlv_len; +| - 1dad: lea 0x11(%r15,%rbp,1),%r15 +| + 1dad: lea 0x4(%r15,%rbp,1),%r15 + +The above reflects the desired change: avoid counting 13 too many bytes; +which is the total size of the double-counted members in +`struct mwifiex_ie_types_rxba_sync`: + +$ pahole -C mwifiex_ie_types_rxba_sync drivers/net/wireless/marvell/mwifiex/11n_rxreorder.o +struct mwifiex_ie_types_rxba_sync { + struct mwifiex_ie_types_header header; /* 0 4 */ + + |----------------------------------------------------------------------- + | u8 mac[6]; /* 4 6 */ | + | u8 tid; /* 10 1 */ | + | u8 reserved; /* 11 1 */ | + | __le16 seq_num; /* 12 2 */ | + | __le16 bitmap_len; /* 14 2 */ | + | u8 bitmap[1]; /* 16 1 */ | + |----------------------------------------------------------------------| + | 13 bytes| + ----------- + + /* size: 17, cachelines: 1, members: 7 */ + /* last cacheline: 17 bytes */ +} __attribute__((__packed__)); + +Fixes: 99ffe72cdae4 ("mwifiex: process rxba_sync event") +Cc: stable@vger.kernel.org +Signed-off-by: Gustavo A. R. Silva +Reviewed-by: Kees Cook +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/06668edd68e7a26bbfeebd1201ae077a2a7a8bce.1692931954.git.gustavoars@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c ++++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +@@ -986,8 +986,8 @@ void mwifiex_11n_rxba_sync_event(struct + } + } + +- tlv_buf_left -= (sizeof(*tlv_rxba) + tlv_len); +- tmp = (u8 *)tlv_rxba + tlv_len + sizeof(*tlv_rxba); ++ tlv_buf_left -= (sizeof(tlv_rxba->header) + tlv_len); ++ tmp = (u8 *)tlv_rxba + sizeof(tlv_rxba->header) + tlv_len; + tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp; + } + }