From: Sasha Levin Date: Thu, 14 Nov 2024 18:07:19 +0000 (-0500) Subject: Fixes for 5.10 X-Git-Tag: v4.19.324~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fded5db800f352b26b355f29499eee4eb827ca54;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/fs-fix-uninitialized-value-issue-in-from_kuid-and-fr.patch b/queue-5.10/fs-fix-uninitialized-value-issue-in-from_kuid-and-fr.patch new file mode 100644 index 00000000000..751176d2e4a --- /dev/null +++ b/queue-5.10/fs-fix-uninitialized-value-issue-in-from_kuid-and-fr.patch @@ -0,0 +1,49 @@ +From a760d04cfded7c32ae15c0c32a25d5ae2af398d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Oct 2024 14:05:51 +0200 +Subject: fs: Fix uninitialized value issue in from_kuid and from_kgid + +From: Alessandro Zanni + +[ Upstream commit 15f34347481648a567db67fb473c23befb796af5 ] + +ocfs2_setattr() uses attr->ia_mode, attr->ia_uid and attr->ia_gid in +a trace point even though ATTR_MODE, ATTR_UID and ATTR_GID aren't set. + +Initialize all fields of newattrs to avoid uninitialized variables, by +checking if ATTR_MODE, ATTR_UID, ATTR_GID are initialized, otherwise 0. + +Reported-by: syzbot+6c55f725d1bdc8c52058@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=6c55f725d1bdc8c52058 +Signed-off-by: Alessandro Zanni +Link: https://lore.kernel.org/r/20241017120553.55331-1-alessandro.zanni87@gmail.com +Reviewed-by: Jan Kara +Signed-off-by: Christian Brauner +Signed-off-by: Sasha Levin +--- + fs/ocfs2/file.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c +index 09a62539ab74d..224ced997d64b 100644 +--- a/fs/ocfs2/file.c ++++ b/fs/ocfs2/file.c +@@ -1133,9 +1133,12 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) + trace_ocfs2_setattr(inode, dentry, + (unsigned long long)OCFS2_I(inode)->ip_blkno, + dentry->d_name.len, dentry->d_name.name, +- attr->ia_valid, attr->ia_mode, +- from_kuid(&init_user_ns, attr->ia_uid), +- from_kgid(&init_user_ns, attr->ia_gid)); ++ attr->ia_valid, ++ attr->ia_valid & ATTR_MODE ? attr->ia_mode : 0, ++ attr->ia_valid & ATTR_UID ? ++ from_kuid(&init_user_ns, attr->ia_uid) : 0, ++ attr->ia_valid & ATTR_GID ? ++ from_kgid(&init_user_ns, attr->ia_gid) : 0); + + /* ensuring we don't even attempt to truncate a symlink */ + if (S_ISLNK(inode->i_mode)) +-- +2.43.0 + diff --git a/queue-5.10/net-usb-qmi_wwan-add-fibocom-fg132-0x0112-compositio.patch b/queue-5.10/net-usb-qmi_wwan-add-fibocom-fg132-0x0112-compositio.patch new file mode 100644 index 00000000000..d32c308fa9a --- /dev/null +++ b/queue-5.10/net-usb-qmi_wwan-add-fibocom-fg132-0x0112-compositio.patch @@ -0,0 +1,57 @@ +From c3da4323b89b21494fb825092ebc4c95cad8c5b2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Oct 2024 22:52:55 +0200 +Subject: net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition + +From: Reinhard Speyerer + +[ Upstream commit 64761c980cbf71fb7a532a8c7299907ea972a88c ] + +Add Fibocom FG132 0x0112 composition: + +T: Bus=03 Lev=02 Prnt=06 Port=01 Cnt=02 Dev#= 10 Spd=12 MxCh= 0 +D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=2cb7 ProdID=0112 Rev= 5.15 +S: Manufacturer=Fibocom Wireless Inc. +S: Product=Fibocom Module +S: SerialNumber=xxxxxxxx +C:* #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan +E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms +E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=83(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=84(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=86(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms + +Signed-off-by: Reinhard Speyerer + +Link: https://patch.msgid.link/ZxLKp5YZDy-OM0-e@arcor.de +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/usb/qmi_wwan.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index 0a1ab8c30a003..3b1076eea6702 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1360,6 +1360,7 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ + {QMI_QUIRK_SET_DTR(0x2c7c, 0x030e, 4)}, /* Quectel EM05GV2 */ + {QMI_QUIRK_SET_DTR(0x2cb7, 0x0104, 4)}, /* Fibocom NL678 series */ ++ {QMI_QUIRK_SET_DTR(0x2cb7, 0x0112, 0)}, /* Fibocom FG132 */ + {QMI_FIXED_INTF(0x0489, 0xe0b4, 0)}, /* Foxconn T77W968 LTE */ + {QMI_FIXED_INTF(0x0489, 0xe0b5, 0)}, /* Foxconn T77W968 LTE with eSIM support*/ + {QMI_FIXED_INTF(0x2692, 0x9025, 4)}, /* Cellient MPL200 (rebranded Qualcomm 05c6:9025) */ +-- +2.43.0 + diff --git a/queue-5.10/series b/queue-5.10/series index 09730bd9225..7f3a9f9ed33 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -73,3 +73,6 @@ bpf-use-kvzmalloc-to-allocate-bpf-verifier-environme.patch crypto-marvell-cesa-disable-hash-algorithms.patch sound-make-config_snd-depend-on-indirect_iomem-inste.patch powerpc-powernv-free-name-on-error-in-opal_event_ini.patch +vdpa-ifcvf-fix-pci_read_config_byte-return-code-hand.patch +fs-fix-uninitialized-value-issue-in-from_kuid-and-fr.patch +net-usb-qmi_wwan-add-fibocom-fg132-0x0112-compositio.patch diff --git a/queue-5.10/vdpa-ifcvf-fix-pci_read_config_byte-return-code-hand.patch b/queue-5.10/vdpa-ifcvf-fix-pci_read_config_byte-return-code-hand.patch new file mode 100644 index 00000000000..a16dbc825e4 --- /dev/null +++ b/queue-5.10/vdpa-ifcvf-fix-pci_read_config_byte-return-code-hand.patch @@ -0,0 +1,41 @@ +From fbe380b4d0806904b6536e1af474af30eb58ac89 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Oct 2024 09:38:12 +0800 +Subject: vDPA/ifcvf: Fix pci_read_config_byte() return code handling + +From: Yuan Can + +[ Upstream commit 7f8825b2a78ac392d3fbb3a2e65e56d9e39d75e9 ] + +ifcvf_init_hw() uses pci_read_config_byte() that returns +PCIBIOS_* codes. The error handling, however, assumes the codes are +normal errnos because it checks for < 0. +Convert the error check to plain non-zero check. + +Fixes: 5a2414bc454e ("virtio: Intel IFC VF driver for VDPA") +Signed-off-by: Yuan Can +Message-Id: <20241017013812.129952-1-yuancan@huawei.com> +Signed-off-by: Michael S. Tsirkin +Acked-by: Jason Wang +Acked-by: Zhu Lingshan +Signed-off-by: Sasha Levin +--- + drivers/vdpa/ifcvf/ifcvf_base.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c +index f2a128e56de5f..b5724b88d42bb 100644 +--- a/drivers/vdpa/ifcvf/ifcvf_base.c ++++ b/drivers/vdpa/ifcvf/ifcvf_base.c +@@ -105,7 +105,7 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *pdev) + u32 i; + + ret = pci_read_config_byte(pdev, PCI_CAPABILITY_LIST, &pos); +- if (ret < 0) { ++ if (ret) { + IFCVF_ERR(pdev, "Failed to read PCI capability list\n"); + return -EIO; + } +-- +2.43.0 +