5.4.296-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/148 cifs: Fix cifs_query_path_info() for Windows NT servers
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit a3e771afbb3bce91c8296828304903e7348003fe ]
For TRANS2 QUERY_PATH_INFO request when the path does not exist, the Windows NT SMB server returns error response STATUS_OBJECT_NAME_NOT_FOUND or ERRDOS/ERRbadfile without the SMBFLG_RESPONSE flag set. Similarly it returns STATUS_DELETE_PENDING when the file is being deleted. And looks like that any error response from TRANS2 QUERY_PATH_INFO does not have SMBFLG_RESPONSE flag set.
So relax check in check_smb_hdr() for detecting if the packet is response for this special case.
This change fixes stat() operation against Windows NT SMB servers and also all operations which depends on -ENOENT result from stat like creat() or mkdir().
--- fs/cifs/misc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/cifs/misc.c +8 -0
@@ -306,6 +306,14 @@ check_smb_hdr(struct smb_hdr *smb)if (smb->Command ==SMB_COM_LOCKING_ANDX )return 0 ; +/* +* Windows NT server returns error resposne (e.g. STATUS_DELETE_PENDING +* or STATUS_OBJECT_NAME_NOT_FOUND or ERRDOS/ERRbadfile or any other) +* for some TRANS2 requests without the RESPONSE flag set in header. +*/ +if (smb->Command ==SMB_COM_TRANSACTION2 && smb->Status.CifsError !=0 ) +return 0 ; +cifs_dbg (VFS ,"Server sent request, not response. mid=%u\n" ,get_mid (smb));return 1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 10/148 usb: cdc-wdm: avoid setting WDM_READ for ZLP-s
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robert Hodaszi <[email protected]>
[ Upstream commit 387602d8a75574fafb451b7a8215e78dfd67ee63 ]
Don't set WDM_READ flag in wdm_in_callback() for ZLP-s, otherwise when userspace tries to poll for available data, it might - incorrectly - believe there is something available, and when it tries to non-blocking read it, it might get stuck in the read loop.
For example this is what glib does for non-blocking read (briefly):
1. poll()
2. if poll returns with non-zero, starts a read data loop:
a. loop on poll() (EINTR disabled)
b. if revents was set, reads data
I. if read returns with EINTR or EAGAIN, goto 2.a. II. otherwise return with data
So if ZLP sets WDM_READ (#1), we expect data, and try to read it (#2). But as that was a ZLP, and we are doing non-blocking read, wdm_read() returns with EAGAIN (#2.b.I), so loop again, and try to read again (#2.a.).
With glib, we might stuck in this loop forever, as EINTR is disabled (#2.a).
--- drivers/usb/class/cdc-wdm.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/usb/class/cdc-wdm.c +9 -14
@@ -89,7 +89,6 @@ struct wdm_device {u16 wMaxCommand;u16 wMaxPacketSize;__le16 inum; -int reslength;int length;int read;int count;
@@ -201,6 +200,11 @@ static void wdm_in_callback(struct urb *urb)if (desc->rerr ==0 && status != -EPIPE ) desc->rerr = status; +if (length ==0 ) { +dev_dbg (&desc->intf->dev,"received ZLP\n" ); + goto skip_zlp; + } +if (length + desc->length > desc->wMaxCommand) {/* The buffer would overflow */ set_bit (WDM_OVERFLOW , &desc->flags);
@@ -209,18 +213,18 @@ static void wdm_in_callback(struct urb *urb)if (!test_bit (WDM_OVERFLOW , &desc->flags)) {memmove (desc->ubuf + desc->length, desc->inbuf, length); desc->length += length; - desc->reslength = length; } } skip_error:if (desc->rerr) {/* -* Since there was an error, userspace may decide to not read -* any data after poll'ing. +* If there was a ZLP or an error, userspace may decide to not +* read any data after poll'ing. * We should respond to further attempts from the device to send * data, so that we can get unstuck. */ +skip_zlp:schedule_work (&desc->service_outs_intr); }else {set_bit (WDM_READ , &desc->flags);
@@ -571,15 +575,6 @@ static ssize_t wdm_read goto retry; } -if (!desc->reslength) {/* zero length read */ -dev_dbg (&desc->intf->dev,"zero length - clearing WDM_READ\n" ); -clear_bit (WDM_READ , &desc->flags); - rv =service_outstanding_interrupt (desc); -spin_unlock_irq (&desc->iuspin); -if (rv <0 ) - goto err; - goto retry; - } cntr = desc->length;spin_unlock_irq (&desc->iuspin); }
@@ -839,7 +834,7 @@ static void service_interrupt_work(struct work_struct *work)spin_lock_irq (&desc->iuspin);service_outstanding_interrupt (desc); -if (!desc->resp_count) { +if (!desc->resp_count && (desc->length || desc->rerr)) {set_bit (WDM_READ , &desc->flags);wake_up (&desc->wait); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 11/148 usb: typec: displayport: Receive DP Status Update NAK request exit dp altmode
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jos Wang <[email protected]>
[ Upstream commit b4b38ffb38c91afd4dc387608db26f6fc34ed40b ]
Although some Type-C DRD devices that do not support the DP Sink function (such as Huawei Mate 40Pro), the Source Port initiates Enter Mode CMD, but the device responds to Enter Mode ACK, the Source port then initiates DP Status Update CMD, and the device responds to DP Status Update NAK.
As PD2.0 spec ("6.4.4.3.4 Enter Mode Command"),A DR_Swap Message Shall Not be sent during Modal Operation between the Port Partners. At this time, the source port initiates DR_Swap message through the "echo device > /sys/class/typec/port0/data_role" command to switch the data role from host to device. The device will initiate a Hard Reset for recovery, resulting in the failure of data role swap.
Therefore, when DP Status Update NAK is received, Exit Mode CMD is initiated to exit the currently entered DP altmode.
--- drivers/usb/typec/altmodes/displayport.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/typec/altmodes/displayport.c +4 -0
@@ -288,6 +288,10 @@ static int dp_altmode_vdm(struct typec_altmode *alt,break ;case CMDT_RSP_NAK :switch (cmd) { +case DP_CMD_STATUS_UPDATE : +if (typec_altmode_exit (alt)) +dev_err (&dp->alt->dev,"Exit Mode Failed!\n" ); +break ;case DP_CMD_CONFIGURE : dp->data.conf =0 ; ret =dp_altmode_configured (dp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 12/148 ALSA: hda: Ignore unsol events for cards being shut down
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 3f100f524e75586537e337b34d18c8d604b398e7 ]
For the classic snd_hda_intel driver, codec->card and bus->card point to the exact same thing. When snd_card_diconnect() fires, bus->shutdown is set thanks to azx_dev_disconnect(). card->shutdown is already set when that happens but both provide basically the same functionality.
For the DSP snd_soc_avs driver where multiple codecs are located on multiple cards, bus->shutdown 'shortcut' is not sufficient. One codec card may be unregistered while other codecs are still operational. Proper check in form of card->shutdown must be used to verify whether the codec's card is being shut down.
--- sound/pci/hda/hda_bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_bind.c +1 -1
@@ -44,7 +44,7 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) struct hda_codec *codec = container_of(dev, struct hda_codec, core);/* ignore unsol events during shutdown */ -if (codec->bus->shutdown) +if (codec->card->shutdown || codec->bus->shutdown)return ;/* ignore unsol events during system suspend/resume */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 13/148 ceph: fix possible integer overflow in ceph_zero_objects()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Kandybka <[email protected]>
[ Upstream commit 0abd87942e0c93964e93224836944712feba1d91 ]
In 'ceph_zero_objects', promote 'object_size' to 'u64' to avoid possible integer overflow.
Compile tested only.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/ceph/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/file.c +1 -1
@@ -1749,7 +1749,7 @@ static int ceph_zero_objects(struct inode *inode, loff_t offset, loff_t length)s32 stripe_unit = ci->i_layout.stripe_unit;s32 stripe_count = ci->i_layout.stripe_count;s32 object_size = ci->i_layout.object_size; -u64 object_set_size = object_size * stripe_count; +u64 object_set_size = (u64 ) object_size * stripe_count;u64 nearly, t;/* round offset up to next period boundary */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 14/148 ovl: Check for NULL d_inode() in ovl_dentry_upper()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 8a39f1c870e9d6fbac5638f3a42a6a6363829c49 ]
In ovl_path_type() and ovl_is_metacopy_dentry() GCC notices that it is possible for OVL_E() to return NULL (which implies that d_inode(dentry) may be NULL). This would result in out of bounds reads via container_of(), seen with GCC 15's -Warray-bounds -fdiagnostics-details. For example:
In file included from arch/x86/include/generated/asm/rwonce.h:1,
from include/linux/compiler.h:339, from include/linux/export.h:5,
from include/linux/linkage.h:7,
from include/linux/fs.h:5,
from fs/overlayfs/util.c:7:
In function 'ovl_upperdentry_dereference',
inlined from 'ovl_dentry_upper' at ../fs/overlayfs/util.c:305:9,
inlined from 'ovl_path_type' at ../fs/overlayfs/util.c:216:6:
include/asm-generic/rwonce.h:44:26: error: array subscript 0 is outside array bounds of 'struct inode[7486503276667837]' [-Werror=array-bounds=]
44 | #define __READ_ONCE(x) (*(const volatile __unqual_scalar_typeof(x) *)&(x))
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/rwonce.h:50:9: note: in expansion of macro '__READ_ONCE'
50 | __READ_ONCE(x); \
| ^~~~~~~~~~~
fs/overlayfs/ovl_entry.h:195:16: note: in expansion of macro 'READ_ONCE'
195 | return READ_ONCE(oi->__upperdentry);
| ^~~~~~~~~ 'ovl_path_type': event 1
185 | return inode ? OVL_I(inode)->oe : NULL;
'ovl_path_type': event 2
Avoid this by allowing ovl_dentry_upper() to return NULL if d_inode() is NULL, as that means the problematic dereferencing can never be reached. Note that this fixes the over-eager compiler warning in an effort to being able to enable -Warray-bounds globally. There is no known behavioral bug here.
--- fs/overlayfs/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/overlayfs/util.c +3 -1
@@ -191,7 +191,9 @@ enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)struct dentry *ovl_dentry_upper (struct dentry *dentry) { -return ovl_upperdentry_dereference (OVL_I (d_inode (dentry))); +struct inode *inode =d_inode (dentry); + +return inode ?ovl_upperdentry_dereference (OVL_I (inode)) :NULL ; }struct dentry *ovl_dentry_lower (struct dentry *dentry)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 15/148 USB: usbtmc: Fix reading stale status byte
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Penkler <[email protected]>
[ Upstream commit 3c1037e2b6a94898f81ed1a68bea146a9db750a5 ]
The ioctl USBTMC488_IOCTL_READ_STB either returns a cached status byte (STB) sent by the device due to a service request (SRQ) condition or the STB obtained from a query to the device with a READ_STATUS_BYTE control message.
When the query is interrupted by an SRQ message on the interrupt pipe, the ioctl still returns the requested STB while the STB of the out-of-band SRQ message is cached for the next call of this ioctl. However the cached SRQ STB represents a state that was previous to the last returned STB. Furthermore the cached SRQ STB can be stale and not reflect the current state of the device.
The fixed ioctl now always reads the STB from the device and if the associated file descriptor has the srq_asserted bit set it ors in the RQS bit to the returned STB and clears the srq_asserted bit conformant to subclass USB488 devices.
Stable-dep-of: acb3dac2805d ("usb: usbtmc: Fix read_stb function and get_stb ioctl")
--- drivers/usb/class/usbtmc.c | 46 +++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 21 deletions(-)
drivers/usb/class/usbtmc.c +25 -21
@@ -475,15 +475,12 @@ static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data)return usbtmc_ioctl_abort_bulk_out_tag (data, data->bTag_last_write); } -static int usbtmc488_ioctl_read_stb (struct usbtmc_file_data *file_data, -void __user *arg) +static int usbtmc_get_stb (struct usbtmc_file_data *file_data,__u8 *stb) {struct usbtmc_device_data *data = file_data->data;struct device *dev = &data->intf->dev; -int srq_asserted =0 ;u8 *buffer;u8 tag; -__u8 stb;int rv;long wait_rv;unsigned long expire;
@@ -491,19 +488,6 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data,dev_dbg (dev,"Enter ioctl_read_stb iin_ep_present: %d\n" , data->iin_ep_present); -spin_lock_irq (&data->dev_lock); - srq_asserted =atomic_xchg (&file_data->srq_asserted, srq_asserted); -if (srq_asserted) { -/* a STB with SRQ is already received */ - stb = file_data->srq_byte; -spin_unlock_irq (&data->dev_lock); - rv =put_user (stb, (__u8 __user *)arg); -dev_dbg (dev,"stb:0x%02x with srq received %d\n" , - (unsigned int )stb, rv); -return rv; - } -spin_unlock_irq (&data->dev_lock); - buffer =kmalloc (8 ,GFP_KERNEL );if (!buffer)return -ENOMEM ;
@@ -552,13 +536,12 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data, data->iin_bTag, tag); } - stb = data->bNotify2; + *stb = data->bNotify2; }else { - stb = buffer[2 ]; + *stb = buffer[2 ]; } - rv =put_user (stb, (__u8 __user *)arg); -dev_dbg (dev,"stb:0x%02x received %d\n" , (unsigned int )stb, rv); +dev_dbg (dev,"stb:0x%02x received %d\n" , (unsigned int )*stb, rv); rv =0 ;
@@ -573,6 +556,27 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data,return rv; } +static int usbtmc488_ioctl_read_stb (struct usbtmc_file_data *file_data, +void __user *arg) +{ +int srq_asserted =0 ; +__u8 stb; +int rv; + + rv =usbtmc_get_stb (file_data, &stb); + +if (rv >0 ) { + srq_asserted =atomic_xchg (&file_data->srq_asserted, + srq_asserted); +if (srq_asserted) + stb |=0x40 ;/* Set RQS bit */ + + rv =put_user (stb, (__u8 __user *)arg); + } +return rv; + +} +static int usbtmc488_ioctl_wait_srq (struct usbtmc_file_data *file_data,__u32 __user *arg) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 16/148 USB: usbtmc: Add USBTMC_IOCTL_GET_STB
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Penkler <[email protected]>
[ Upstream commit c9784e23c1020e63d6dba5e10ca8bf3d8b85c19c ]
This new ioctl reads the status byte (STB) from the device and returns the STB unmodified to the application. The srq_asserted bit is not taken into account and not changed.
This ioctl is useful to support non USBTMC-488 compliant devices.
Stable-dep-of: acb3dac2805d ("usb: usbtmc: Fix read_stb function and get_stb ioctl")
--- drivers/usb/class/usbtmc.c | 6 ++++++ include/uapi/linux/usb/tmc.h | 2 ++ 2 files changed, 8 insertions(+)
drivers/usb/class/usbtmc.c +6 -0
@@ -2173,6 +2173,12 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg) file_data->auto_abort = !!tmp_byte;break ; +case USBTMC_IOCTL_GET_STB : + retval =usbtmc_get_stb (file_data, &tmp_byte); +if (retval >0 ) + retval =put_user (tmp_byte, (__u8 __user *)arg); +break ; +case USBTMC_IOCTL_CANCEL_IO : retval =usbtmc_ioctl_cancel_io (file_data);break ;
include/uapi/linux/usb/tmc.h +2 -0
@@ -102,6 +102,8 @@ struct usbtmc_message {#define USBTMC_IOCTL_MSG_IN_ATTR _IOR(USBTMC_IOC_NR, 24, __u8)#define USBTMC_IOCTL_AUTO_ABORT _IOW(USBTMC_IOC_NR, 25, __u8) +#define USBTMC_IOCTL_GET_STB _IOR(USBTMC_IOC_NR, 26, __u8) +/* Cancel and cleanup asynchronous calls */ #define USBTMC_IOCTL_CANCEL_IO _IO(USBTMC_IOC_NR, 35)#define USBTMC_IOCTL_CLEANUP_IO _IO(USBTMC_IOC_NR, 36)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 17/148 usb: usbtmc: Fix read_stb function and get_stb ioctl
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Penkler <[email protected]>
[ Upstream commit acb3dac2805d3342ded7dbbd164add32bbfdf21c ]
The usbtmc488_ioctl_read_stb function relied on a positive return from usbtmc_get_stb to reset the srq condition in the driver. The USBTMC_IOCTL_GET_STB case tested for a positive return to return the stb to the user.
Commit: <cac01bd178d6> ("usb: usbtmc: Fix erroneous get_stb ioctl error returns") changed the return value of usbtmc_get_stb to 0 on success instead of returning the value of usb_control_msg which is positive in the normal case. This change caused the function usbtmc488_ioctl_read_stb and the USBTMC_IOCTL_GET_STB ioctl to no longer function correctly.
Change the test in usbtmc488_ioctl_read_stb to test for failure first and return the failure code immediately.
Change the test for the USBTMC_IOCTL_GET_STB ioctl to test for 0 instead of a positive value.
--- drivers/usb/class/usbtmc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/usb/class/usbtmc.c +9 -8
@@ -565,14 +565,15 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data, rv =usbtmc_get_stb (file_data, &stb); -if (rv >0 ) { - srq_asserted =atomic_xchg (&file_data->srq_asserted, - srq_asserted); -if (srq_asserted) - stb |=0x40 ;/* Set RQS bit */ +if (rv <0 ) +return rv; + + srq_asserted =atomic_xchg (&file_data->srq_asserted, srq_asserted); +if (srq_asserted) + stb |=0x40 ;/* Set RQS bit */ + + rv =put_user (stb, (__u8 __user *)arg); - rv =put_user (stb, (__u8 __user *)arg); - }return rv; }
@@ -2175,7 +2176,7 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case USBTMC_IOCTL_GET_STB : retval =usbtmc_get_stb (file_data, &tmp_byte); -if (retval >0 ) +if (!retval) retval =put_user (tmp_byte, (__u8 __user *)arg);break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 18/148 VMCI: check context->notify_page after call to get_user_pages_fast() to avoid GPF
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Kennedy <[email protected]>
[ Upstream commit 1a726cb47fd204109c767409fa9ca15a96328f14 ]
The call to get_user_pages_fast() in vmci_host_setup_notify() can return NULL context->notify_page causing a GPF. To avoid GPF check if context->notify_page == NULL and return error if so.
general protection fault, probably for non-canonical address
0xe0009d1000000060: 0000 [#1] PREEMPT SMP KASAN NOPTI
KASAN: maybe wild-memory-access in range [0x0005088000000300-
0x0005088000000307]
CPU: 2 PID: 26180 Comm: repro_34802241 Not tainted 6.1.0-rc4 #1
Hardware name: Red Hat KVM, BIOS 1.15.0-2.module+el8.6.0 04/01/2014
RIP: 0010:vmci_ctx_check_signal_notify+0x91/0xe0
Call Trace:
<TASK>
vmci_host_unlocked_ioctl+0x362/0x1f40
__x64_sys_ioctl+0x1a1/0x230
do_syscall_64+0x3a/0x90
entry_SYSCALL_64_after_hwframe+0x63/0xcdStable-dep-of: 1bd6406fb5f3 ("VMCI: fix race between vmci_host_setup_notify and vmci_ctx_unset_notify")
--- drivers/misc/vmw_vmci/vmci_host.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/vmw_vmci/vmci_host.c +2 -0
@@ -245,6 +245,8 @@ static int vmci_host_setup_notify(struct vmci_ctx *context, context->notify_page =NULL ;return VMCI_ERROR_GENERIC ; } +if (context->notify_page ==NULL ) +return VMCI_ERROR_UNAVAILABLE ;/* * Map the locked page and set up notify pointer.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 19/148 VMCI: fix race between vmci_host_setup_notify and vmci_ctx_unset_notify
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wupeng Ma <[email protected]>
[ Upstream commit 1bd6406fb5f36c2bb1e96e27d4c3e9f4d09edde4 ]
During our test, it is found that a warning can be trigger in try_grab_folio as follow:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1678 at mm/gup.c:147 try_grab_folio+0x106/0x130 Modules linked in: CPU: 0 UID: 0 PID: 1678 Comm: syz.3.31 Not tainted 6.15.0-rc5 #163 PREEMPT(undef) RIP: 0010:try_grab_folio+0x106/0x130 Call Trace: <TASK> follow_huge_pmd+0x240/0x8e0 follow_pmd_mask.constprop.0.isra.0+0x40b/0x5c0 follow_pud_mask.constprop.0.isra.0+0x14a/0x170 follow_page_mask+0x1c2/0x1f0 __get_user_pages+0x176/0x950 __gup_longterm_locked+0x15b/0x1060 ? gup_fast+0x120/0x1f0 gup_fast_fallback+0x17e/0x230 get_user_pages_fast+0x5f/0x80 vmci_host_unlocked_ioctl+0x21c/0xf80 RIP: 0033:0x54d2cd ---[ end trace 0000000000000000 ]---
Digging into the source, context->notify_page may init by get_user_pages_fast and can be seen in vmci_ctx_unset_notify which will try to put_page. However get_user_pages_fast is not finished here and lead to following try_grab_folio warning. The race condition is shown as follow:
cpu0 cpu1vmci_host_do_set_notifyvmci_host_setup_notifyget_user_pages_fast(uva, 1, FOLL_WRITE, &context->notify_page); lockless_pages_from_mmgup_pgd_rangegup_huge_pmd // update &context->notify_page
vmci_host_do_set_notify vmci_ctx_unset_notify notify_page = context->notify_page; if (notify_page) put_page(notify_page); // page is freed
__gup_longterm_locked__get_user_pagesfollow_trans_huge_pmdtry_grab_folio // warn here
To slove this, use local variable page to make notify_page can be seen after finish get_user_pages_fast.
--- drivers/misc/vmw_vmci/vmci_host.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/misc/vmw_vmci/vmci_host.c +5 -6
@@ -222,6 +222,7 @@ static int drv_cp_harray_to_user(void __user *user_buf_uva,static int vmci_host_setup_notify (struct vmci_ctx *context,unsigned long uva) { +struct page *page;int retval;if (context->notify_page) {
@@ -240,13 +241,11 @@ static int vmci_host_setup_notify(struct vmci_ctx *context,/* * Lock physical page backing a given user VA. */ - retval =get_user_pages_fast (uva,1 ,FOLL_WRITE , &context->notify_page); -if (retval !=1 ) { - context->notify_page =NULL ; + retval =get_user_pages_fast (uva,1 ,FOLL_WRITE , &page); +if (retval !=1 )return VMCI_ERROR_GENERIC ; - } -if (context->notify_page ==NULL ) -return VMCI_ERROR_UNAVAILABLE ; + + context->notify_page = page;/* * Map the locked page and set up notify pointer.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 2/148 mailbox: Not protect module_put with spin_lock_irqsave
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit dddbd233e67e792bb0a3f9694a4707e6be29b2c6 ]
&chan->lock is not supposed to protect 'chan->mbox'. And in __mbox_bind_client, try_module_get is also not protected by &chan->lock. So move module_put out of the lock protected region.
--- drivers/mailbox/mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mailbox/mailbox.c +1 -1
@@ -459,8 +459,8 @@ void mbox_free_channel(struct mbox_chan *chan)if (chan->txdone_method ==TXDONE_BY_ACK ) chan->txdone_method =TXDONE_BY_POLL ; -module_put (chan->mbox->dev->driver->owner);spin_unlock_irqrestore (&chan->lock, flags); +module_put (chan->mbox->dev->driver->owner); }EXPORT_SYMBOL_GPL (mbox_free_channel);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 20/148 kbuild: use -MMD instead of -MD to exclude system headers from dependency
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 30a7729771731971839cc969d2a321e6ea7a144b ]
This omits system headers from the generated header dependency.
System headers are not updated unless you upgrade the compiler. Nor do they contain CONFIG options, so fixdep does not need to parse them.
Having said that, the effect of this optimization will be quite small because the kernel code generally does not include system headers except <stdarg.h>. Host programs include a lot of system headers, but there are not so many in the kernel tree.
At first, keeping system headers in .*.cmd files might be useful to detect the compiler update, but there is no guarantee that <stdarg.h> is included from every file. So, I implemented a more reliable way in the previous commit.
Stable-dep-of: 02e9a22ceef0 ("kbuild: hdrcheck: fix cross build with clang")
--- scripts/Kbuild.include | 2 +- scripts/Makefile.host | 4 ++-- scripts/Makefile.lib | 8 ++++---- usr/include/Makefile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
scripts/Kbuild.include +1 -1
@@ -16,7 +16,7 @@ pound := \# dot-target = $(dir $@).$(notdir $@) ### -# The temporary file to save gcc -MD generated dependencies must not +# The temporary file to save gcc -MMD generated dependencies must not # contain a comma depfile = $(subst $(comma),_,$(dot-target).d)
scripts/Makefile.host +2 -2
@@ -92,8 +92,8 @@ _hostcxx_flags += -I $(objtree)/$(obj) endif endif -hostc_flags = -Wp,-MD,$(depfile) $(_hostc_flags) -hostcxx_flags = -Wp,-MD,$(depfile) $(_hostcxx_flags) +hostc_flags = -Wp,-MMD,$(depfile) $(_hostc_flags) +hostcxx_flags = -Wp,-MMD,$(depfile) $(_hostcxx_flags) ##### # Compile programs on the host
scripts/Makefile.lib +4 -4
@@ -160,22 +160,22 @@ modkern_aflags = $(if $(part-of-module), \ $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE), \ $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)) -c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ +c_flags = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ -include $(srctree)/include/linux/compiler_types.h \ $(_c_flags) $(modkern_cflags) \ $(basename_flags) $(modname_flags) -a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ +a_flags = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(_a_flags) $(modkern_aflags) -cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ +cpp_flags = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(_cpp_flags) ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) DTC_INCLUDE := $(srctree)/scripts/dtc/include-prefixes -dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ +dtc_cpp_flags = -Wp,-MMD,$(depfile).pre.tmp -nostdinc \ $(addprefix -I,$(DTC_INCLUDE)) \ -undef -D__DTS__
usr/include/Makefile +1 -1
@@ -8,7 +8,7 @@ # We cannot go as far as adding -Wpedantic since it emits too many warnings. UAPI_CFLAGS := -std=c90 -Wall -Werror=implicit-function-declaration -override c_flags = $(UAPI_CFLAGS) -Wp,-MD,$(depfile) -I$(objtree)/usr/include +override c_flags = $(UAPI_CFLAGS) -Wp,-MMD,$(depfile) -I$(objtree)/usr/include # The following are excluded for now because they fail to build. #
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 21/148 bpfilter: match bit size of bpfilter_umh to that of the kernel
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 9371f86ecb60f6f1f120e3d93fe892bbb70d04c0 ]
bpfilter_umh is built for the default machine bit of the compiler, which may not match to the bit size of the kernel.
This happens in the scenario below:
You can use biarch GCC that defaults to 64-bit for building the 32-bit kernel. In this case, Kbuild passes -m32 to teach the compiler to produce 32-bit kernel space objects. However, it is missing when building bpfilter_umh. It is built as a 64-bit ELF, and then embedded into the 32-bit kernel.
The 32-bit kernel and 64-bit umh is a bad combination.
In theory, we can have 32-bit umh running on 64-bit kernel, but we do not have a good reason to support such a usecase.
The best is to match the bit size between them.
Pass -m32 or -m64 to the umh build command if it is found in $(KBUILD_CFLAGS). Evaluate CC_CAN_LINK against the kernel bit-size.
Stable-dep-of: 02e9a22ceef0 ("kbuild: hdrcheck: fix cross build with clang")
--- init/Kconfig | 4 +++- net/bpfilter/Makefile | 5 +++-- usr/include/Makefile | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-)
init/Kconfig +3 -1
@@ -28,7 +28,9 @@ config CLANG_VERSION default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) config CC_CAN_LINK - def_bool $(success,$(srctree)/scripts/cc-can-link.sh $(CC)) + bool + default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m64-flag)) if 64BIT + default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m32-flag)) config CC_HAS_ASM_GOTO def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))
net/bpfilter/Makefile +3 -2
@@ -5,14 +5,15 @@ hostprogs-y := bpfilter_umh bpfilter_umh-objs := main.o -KBUILD_HOSTCFLAGS += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi +KBUILD_HOSTCFLAGS += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi \ + $(filter -m32 -m64, $(KBUILD_CFLAGS)) HOSTCC := $(CC) ifeq ($(CONFIG_BPFILTER_UMH), y) # builtin bpfilter_umh should be compiled with -static # since rootfs isn't mounted at the time of __init # function is called and do_execv won't find elf interpreter -KBUILD_HOSTLDFLAGS += -static +KBUILD_HOSTLDFLAGS += -static $(filter -m32 -m64, $(KBUILD_CFLAGS)) endif $(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh
usr/include/Makefile +4 -0
@@ -8,6 +8,10 @@ # We cannot go as far as adding -Wpedantic since it emits too many warnings. UAPI_CFLAGS := -std=c90 -Wall -Werror=implicit-function-declaration +# In theory, we do not care -m32 or -m64 for header compile tests. +# It is here just because CONFIG_CC_CAN_LINK is tested with -m32 or -m64. +UAPI_CFLAGS += $(filter -m32 -m64, $(KBUILD_CFLAGS)) + override c_flags = $(UAPI_CFLAGS) -Wp,-MMD,$(depfile) -I$(objtree)/usr/include # The following are excluded for now because they fail to build.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 22/148 kbuild: add --target to correctly cross-compile UAPI headers with Clang
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 9fbed27a7a1101c926718dfa9b49aff1d04477b5 ]
When you compile-test UAPI headers (CONFIG_UAPI_HEADER_TEST=y) with Clang, they are currently compiled for the host target (likely x86_64) regardless of the given ARCH=.
In fact, some exported headers include libc headers. For example, include/uapi/linux/agpgart.h includes <stdlib.h> after being exported. The header search paths should match to the target we are compiling them for.
Pick up the --target triple from KBUILD_CFLAGS in the same ways as commit 7f58b487e9ff ("kbuild: make Clang build userprogs for target architecture").
Stable-dep-of: 02e9a22ceef0 ("kbuild: hdrcheck: fix cross build with clang")
--- usr/include/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
usr/include/Makefile +1 -1
@@ -10,7 +10,7 @@ UAPI_CFLAGS := -std=c90 -Wall -Werror=implicit-function-declaration # In theory, we do not care -m32 or -m64 for header compile tests. # It is here just because CONFIG_CC_CAN_LINK is tested with -m32 or -m64. -UAPI_CFLAGS += $(filter -m32 -m64, $(KBUILD_CFLAGS)) +UAPI_CFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) override c_flags = $(UAPI_CFLAGS) -Wp,-MMD,$(depfile) -I$(objtree)/usr/include
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 23/148 kbuild: hdrcheck: fix cross build with clang
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 02e9a22ceef0227175e391902d8760425fa072c6 ]
The headercheck tries to call clang with a mix of compiler arguments that don't include the target architecture. When building e.g. x86 headers on arm64, this produces a warning like
clang: warning: unknown platform, assuming -mfloat-abi=soft
Add in the KBUILD_CPPFLAGS, which contain the target, in order to make it build properly.
See also 1b71c2fb04e7 ("kbuild: userprogs: fix bitsize and target detection on clang").
--- usr/include/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
usr/include/Makefile +1 -1
@@ -10,7 +10,7 @@ UAPI_CFLAGS := -std=c90 -Wall -Werror=implicit-function-declaration # In theory, we do not care -m32 or -m64 for header compile tests. # It is here just because CONFIG_CC_CAN_LINK is tested with -m32 or -m64. -UAPI_CFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) +UAPI_CFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)) override c_flags = $(UAPI_CFLAGS) -Wp,-MMD,$(depfile) -I$(objtree)/usr/include
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 24/148 of: property: define of_property_read_u{8,16,32,64}_array() unconditionally
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit 2ca42c3ad9ed875b136065b010753a4caaaa1d38 ]
We can get rid of all the empty stubs because all these functions call of_property_read_variable_u{8,16,32,64}_array() which already have an empty stub if CONFIG_OF is not defined.
Stable-dep-of: 171eb6f71e9e ("ASoC: meson: meson-card-utils: use of_property_present() for DT parsing")
--- include/linux/of.h | 274 ++++++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 150 deletions(-)
include/linux/of.h +124 -150
@@ -415,130 +415,6 @@ extern int of_detach_node(struct device_node *);#define of_match_ptr (_ptr) (_ptr) -/** -* of_property_read_u8_array - Find and read an array of u8 from a property. -* -* @np: device node from which the property value is to be read. -* @propname: name of the property to be searched. -* @out_values: pointer to return value, modified only if return value is 0. -* @sz: number of array elements to read -* -* Search for a property in a device node and read 8-bit value(s) from -* it. -* -* dts entry of array should be like: -* ``property = /bits/ 8 <0x50 0x60 0x70>;`` -* -* Return: 0 on success, -EINVAL if the property does not exist, -* -ENODATA if property does not have a value, and -EOVERFLOW if the -* property data isn't large enough. -* -* The out_values is modified only if a valid u8 value can be decoded. -*/ -static inline int of_property_read_u8_array (const struct device_node *np, -const char *propname, -u8 *out_values,size_t sz) -{ -int ret =of_property_read_variable_u8_array (np, propname, out_values, - sz,0 ); -if (ret >=0 ) -return 0 ; -else -return ret; -} - -/** -* of_property_read_u16_array - Find and read an array of u16 from a property. -* -* @np: device node from which the property value is to be read. -* @propname: name of the property to be searched. -* @out_values: pointer to return value, modified only if return value is 0. -* @sz: number of array elements to read -* -* Search for a property in a device node and read 16-bit value(s) from -* it. -* -* dts entry of array should be like: -* ``property = /bits/ 16 <0x5000 0x6000 0x7000>;`` -* -* Return: 0 on success, -EINVAL if the property does not exist, -* -ENODATA if property does not have a value, and -EOVERFLOW if the -* property data isn't large enough. -* -* The out_values is modified only if a valid u16 value can be decoded. -*/ -static inline int of_property_read_u16_array (const struct device_node *np, -const char *propname, -u16 *out_values,size_t sz) -{ -int ret =of_property_read_variable_u16_array (np, propname, out_values, - sz,0 ); -if (ret >=0 ) -return 0 ; -else -return ret; -} - -/** -* of_property_read_u32_array - Find and read an array of 32 bit integers -* from a property. -* -* @np: device node from which the property value is to be read. -* @propname: name of the property to be searched. -* @out_values: pointer to return value, modified only if return value is 0. -* @sz: number of array elements to read -* -* Search for a property in a device node and read 32-bit value(s) from -* it. -* -* Return: 0 on success, -EINVAL if the property does not exist, -* -ENODATA if property does not have a value, and -EOVERFLOW if the -* property data isn't large enough. -* -* The out_values is modified only if a valid u32 value can be decoded. -*/ -static inline int of_property_read_u32_array (const struct device_node *np, -const char *propname, -u32 *out_values,size_t sz) -{ -int ret =of_property_read_variable_u32_array (np, propname, out_values, - sz,0 ); -if (ret >=0 ) -return 0 ; -else -return ret; -} - -/** -* of_property_read_u64_array - Find and read an array of 64 bit integers -* from a property. -* -* @np: device node from which the property value is to be read. -* @propname: name of the property to be searched. -* @out_values: pointer to return value, modified only if return value is 0. -* @sz: number of array elements to read -* -* Search for a property in a device node and read 64-bit value(s) from -* it. -* -* Return: 0 on success, -EINVAL if the property does not exist, -* -ENODATA if property does not have a value, and -EOVERFLOW if the -* property data isn't large enough. -* -* The out_values is modified only if a valid u64 value can be decoded. -*/ -static inline int of_property_read_u64_array (const struct device_node *np, -const char *propname, -u64 *out_values,size_t sz) -{ -int ret =of_property_read_variable_u64_array (np, propname, out_values, - sz,0 ); -if (ret >=0 ) -return 0 ; -else -return ret; -} -/* * struct property *prop; * const __be32 *p;
@@ -719,32 +595,6 @@ static inline int of_property_count_elems_of_size(const struct device_node *np,return -ENOSYS ; } -static inline int of_property_read_u8_array (const struct device_node *np, -const char *propname,u8 *out_values,size_t sz) -{ -return -ENOSYS ; -} - -static inline int of_property_read_u16_array (const struct device_node *np, -const char *propname,u16 *out_values,size_t sz) -{ -return -ENOSYS ; -} - -static inline int of_property_read_u32_array (const struct device_node *np, -const char *propname, -u32 *out_values,size_t sz) -{ -return -ENOSYS ; -} - -static inline int of_property_read_u64_array (const struct device_node *np, -const char *propname, -u64 *out_values,size_t sz) -{ -return -ENOSYS ; -} -static inline int of_property_read_u32_index (const struct device_node *np,const char *propname,u32 index,u32 *out_value) {
@@ -1206,6 +1056,130 @@ static inline bool of_property_read_bool(const struct device_node *np,return prop ? true : false; } +/** +* of_property_read_u8_array - Find and read an array of u8 from a property. +* +* @np: device node from which the property value is to be read. +* @propname: name of the property to be searched. +* @out_values: pointer to return value, modified only if return value is 0. +* @sz: number of array elements to read +* +* Search for a property in a device node and read 8-bit value(s) from +* it. +* +* dts entry of array should be like: +* ``property = /bits/ 8 <0x50 0x60 0x70>;`` +* +* Return: 0 on success, -EINVAL if the property does not exist, +* -ENODATA if property does not have a value, and -EOVERFLOW if the +* property data isn't large enough. +* +* The out_values is modified only if a valid u8 value can be decoded. +*/ +static inline int of_property_read_u8_array (const struct device_node *np, +const char *propname, +u8 *out_values,size_t sz) +{ +int ret =of_property_read_variable_u8_array (np, propname, out_values, + sz,0 ); +if (ret >=0 ) +return 0 ; +else +return ret; +} + +/** +* of_property_read_u16_array - Find and read an array of u16 from a property. +* +* @np: device node from which the property value is to be read. +* @propname: name of the property to be searched. +* @out_values: pointer to return value, modified only if return value is 0. +* @sz: number of array elements to read +* +* Search for a property in a device node and read 16-bit value(s) from +* it. +* +* dts entry of array should be like: +* ``property = /bits/ 16 <0x5000 0x6000 0x7000>;`` +* +* Return: 0 on success, -EINVAL if the property does not exist, +* -ENODATA if property does not have a value, and -EOVERFLOW if the +* property data isn't large enough. +* +* The out_values is modified only if a valid u16 value can be decoded. +*/ +static inline int of_property_read_u16_array (const struct device_node *np, +const char *propname, +u16 *out_values,size_t sz) +{ +int ret =of_property_read_variable_u16_array (np, propname, out_values, + sz,0 ); +if (ret >=0 ) +return 0 ; +else +return ret; +} + +/** +* of_property_read_u32_array - Find and read an array of 32 bit integers +* from a property. +* +* @np: device node from which the property value is to be read. +* @propname: name of the property to be searched. +* @out_values: pointer to return value, modified only if return value is 0. +* @sz: number of array elements to read +* +* Search for a property in a device node and read 32-bit value(s) from +* it. +* +* Return: 0 on success, -EINVAL if the property does not exist, +* -ENODATA if property does not have a value, and -EOVERFLOW if the +* property data isn't large enough. +* +* The out_values is modified only if a valid u32 value can be decoded. +*/ +static inline int of_property_read_u32_array (const struct device_node *np, +const char *propname, +u32 *out_values,size_t sz) +{ +int ret =of_property_read_variable_u32_array (np, propname, out_values, + sz,0 ); +if (ret >=0 ) +return 0 ; +else +return ret; +} + +/** +* of_property_read_u64_array - Find and read an array of 64 bit integers +* from a property. +* +* @np: device node from which the property value is to be read. +* @propname: name of the property to be searched. +* @out_values: pointer to return value, modified only if return value is 0. +* @sz: number of array elements to read +* +* Search for a property in a device node and read 64-bit value(s) from +* it. +* +* Return: 0 on success, -EINVAL if the property does not exist, +* -ENODATA if property does not have a value, and -EOVERFLOW if the +* property data isn't large enough. +* +* The out_values is modified only if a valid u64 value can be decoded. +*/ +static inline int of_property_read_u64_array (const struct device_node *np, +const char *propname, +u64 *out_values,size_t sz) +{ +int ret =of_property_read_variable_u64_array (np, propname, out_values, + sz,0 ); +if (ret >=0 ) +return 0 ; +else +return ret; +} +static inline int of_property_read_u8 (const struct device_node *np,const char *propname,u8 *out_value)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 25/148 of: Add of_property_present() helper
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit 9cbad37ce8122de32a1529e394b468bc101c9e7f ]
Add an of_property_present() function similar to fwnode_property_present(). of_property_read_bool() could be used directly, but it is cleaner to not use it on non-boolean properties.
Stable-dep-of: 171eb6f71e9e ("ASoC: meson: meson-card-utils: use of_property_present() for DT parsing")
--- include/linux/of.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
include/linux/of.h +16 -1
@@ -1044,7 +1044,8 @@ static inline int of_property_read_string_index(const struct device_node *np,* @np: device node from which the property value is to be read. * @propname: name of the property to be searched. * -* Search for a property in a device node. +* Search for a boolean property in a device node. Usage on non-boolean +* property types is deprecated. * * Return: true if the property exists false otherwise. */
@@ -1056,6 +1057,20 @@ static inline bool of_property_read_bool(const struct device_node *np,return prop ? true : false; } +/** +* of_property_present - Test if a property is present in a node +* @np: device node to search for the property. +* @propname: name of the property to be searched. +* +* Test for a property present in a device node. +* +* Return: true if the property exists false otherwise. +*/ +static inline bool of_property_present (const struct device_node *np,const char *propname) +{ +return of_property_read_bool (np, propname); +} +/** * of_property_read_u8_array - Find and read an array of u8 from a property. *
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 26/148 ASoC: meson: meson-card-utils: use of_property_present() for DT parsing
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Blumenstingl <[email protected]>
[ Upstream commit 171eb6f71e9e3ba6a7410a1d93f3ac213f39dae2 ]
Commit c141ecc3cecd ("of: Warn when of_property_read_bool() is used on non-boolean properties") added a warning when trying to parse a property with a value (boolean properties are defined as: absent = false, present without any value = true). This causes a warning from meson-card-utils.
meson-card-utils needs to know about the existence of the "audio-routing" and/or "audio-widgets" properties in order to properly parse them. Switch to of_property_present() in order to silence the following warning messages during boot:
OF: /sound: Read of boolean property 'audio-routing' with a value.
OF: /sound: Read of boolean property 'audio-widgets' with a value.
--- sound/soc/meson/meson-card-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/meson/meson-card-utils.c +1 -1
@@ -244,7 +244,7 @@ static int meson_card_parse_of_optional(struct snd_soc_card *card, const char *p)) {/* If property is not provided, don't fail ... */ -if (!of_property_read_bool (card->dev->of_node, propname)) +if (!of_property_present (card->dev->of_node, propname))return 0 ;/* ... but do fail if it is provided and the parsing fails */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 27/148 fs/jfs: consolidate sanity checking in dbMount
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Kleikamp <[email protected]>
[ Upstream commit 0d250b1c52484d489e31df2cf9118b7c4bd49d31 ]
Sanity checks have been added to dbMount as individual if clauses with identical error handling. Move these all into one clause.
Stable-dep-of: 37bfb464ddca ("jfs: validate AG parameters in dbMount() to prevent crashes")
--- fs/jfs/jfs_dmap.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-)
fs/jfs/jfs_dmap.c +9 -28
@@ -178,45 +178,26 @@ int dbMount(struct inode *ipbmap) dbmp_le = (struct dbmap_disk *) mp->data; bmp->db_mapsize =le64_to_cpu (dbmp_le->dn_mapsize); bmp->db_nfree =le64_to_cpu (dbmp_le->dn_nfree); - bmp->db_l2nbperpage =le32_to_cpu (dbmp_le->dn_l2nbperpage); -if (bmp->db_l2nbperpage >L2PSIZE -L2MINBLOCKSIZE || - bmp->db_l2nbperpage <0 ) { - err = -EINVAL ; - goto err_release_metapage; - } - bmp->db_numag =le32_to_cpu (dbmp_le->dn_numag); -if (!bmp->db_numag || bmp->db_numag >MAXAG ) { - err = -EINVAL ; - goto err_release_metapage; - } - bmp->db_maxlevel =le32_to_cpu (dbmp_le->dn_maxlevel); bmp->db_maxag =le32_to_cpu (dbmp_le->dn_maxag); bmp->db_agpref =le32_to_cpu (dbmp_le->dn_agpref); -if (bmp->db_maxag >=MAXAG || bmp->db_maxag <0 || - bmp->db_agpref >=MAXAG || bmp->db_agpref <0 ) { - err = -EINVAL ; - goto err_release_metapage; - } - bmp->db_aglevel =le32_to_cpu (dbmp_le->dn_aglevel); bmp->db_agheight =le32_to_cpu (dbmp_le->dn_agheight); bmp->db_agwidth =le32_to_cpu (dbmp_le->dn_agwidth); -if (!bmp->db_agwidth) { - err = -EINVAL ; - goto err_release_metapage; - } bmp->db_agstart =le32_to_cpu (dbmp_le->dn_agstart); bmp->db_agl2size =le32_to_cpu (dbmp_le->dn_agl2size); -if (bmp->db_agl2size >L2MAXL2SIZE -L2MAXAG || - bmp->db_agl2size <0 ) { - err = -EINVAL ; - goto err_release_metapage; - } -if (((bmp->db_mapsize -1 ) >> bmp->db_agl2size) >MAXAG ) { +if ((bmp->db_l2nbperpage >L2PSIZE -L2MINBLOCKSIZE ) || + (bmp->db_l2nbperpage <0 ) || + !bmp->db_numag || (bmp->db_numag >MAXAG ) || + (bmp->db_maxag >=MAXAG ) || (bmp->db_maxag <0 ) || + (bmp->db_agpref >=MAXAG ) || (bmp->db_agpref <0 ) || + !bmp->db_agwidth || + (bmp->db_agl2size >L2MAXL2SIZE -L2MAXAG ) || + (bmp->db_agl2size <0 ) || + ((bmp->db_mapsize -1 ) >> bmp->db_agl2size) >MAXAG ) { err = -EINVAL ; goto err_release_metapage; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 28/148 jfs: validate AG parameters in dbMount() to prevent crashes
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasiliy Kovalev <[email protected]>
[ Upstream commit 37bfb464ddca87f203071b5bd562cd91ddc0b40a ]
Validate db_agheight, db_agwidth, and db_agstart in dbMount to catch corrupted metadata early and avoid undefined behavior in dbAllocAG. Limits are derived from L2LPERCTL, LPERCTL/MAXAG, and CTLTREESIZE:
- agheight: 0 to L2LPERCTL/2 (0 to 5) ensures shift (L2LPERCTL - 2*agheight) >= 0.
- agwidth: 1 to min(LPERCTL/MAXAG, 2^(L2LPERCTL - 2*agheight)) ensures agperlev >= 1.
- Ranges: 1-8 (agheight 0-3), 1-4 (agheight 4), 1 (agheight 5).
- LPERCTL/MAXAG = 1024/128 = 8 limits leaves per AG;
2^(10 - 2*agheight) prevents division to 0.- agstart: 0 to CTLTREESIZE-1 - agwidth*(MAXAG-1) keeps ti within stree (size 1365).
- Ranges: 0-1237 (agwidth 1), 0-348 (agwidth 8).
UBSAN: shift-out-of-bounds in fs/jfs/jfs_dmap.c:1400:9 shift exponent -335544310 is negative CPU: 0 UID: 0 PID: 5822 Comm: syz-executor130 Not tainted 6.14.0-rc5-syzkaller #0 Hardware name: Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 ubsan_epilogue lib/ubsan.c:231 [inline] __ubsan_handle_shift_out_of_bounds+0x3c8/0x420 lib/ubsan.c:468 dbAllocAG+0x1087/0x10b0 fs/jfs/jfs_dmap.c:1400 dbDiscardAG+0x352/0xa20 fs/jfs/jfs_dmap.c:1613 jfs_ioc_trim+0x45a/0x6b0 fs/jfs/jfs_discard.c:105 jfs_ioctl+0x2cd/0x3e0 fs/jfs/ioctl.c:131 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:906 [inline] __se_sys_ioctl+0xf5/0x170 fs/ioctl.c:892 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- fs/jfs/jfs_dmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/jfs/jfs_dmap.c +5 -1
@@ -194,7 +194,11 @@ int dbMount(struct inode *ipbmap) !bmp->db_numag || (bmp->db_numag >MAXAG ) || (bmp->db_maxag >=MAXAG ) || (bmp->db_maxag <0 ) || (bmp->db_agpref >=MAXAG ) || (bmp->db_agpref <0 ) || - !bmp->db_agwidth || + (bmp->db_agheight <0 ) || (bmp->db_agheight > (L2LPERCTL >>1 )) || + (bmp->db_agwidth <1 ) || (bmp->db_agwidth > (LPERCTL /MAXAG )) || + (bmp->db_agwidth > (1 << (L2LPERCTL - (bmp->db_agheight <<1 )))) || + (bmp->db_agstart <0 ) || + (bmp->db_agstart > (CTLTREESIZE -1 - bmp->db_agwidth * (MAXAG -1 ))) || (bmp->db_agl2size >L2MAXL2SIZE -L2MAXAG ) || (bmp->db_agl2size <0 ) || ((bmp->db_mapsize - 1) >> bmp->db_agl2size) > MAXAG) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 29/148 media: cxusb: use dev_dbg() rather than hand-rolled debug
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Young <[email protected]>
[ Upstream commit c376d66515f89dd833b344c419e313db9ad169b5 ]
This solves the following compiler warnings:
drivers/media/usb/dvb-usb/cxusb.c: In function ‘cxusb_gpio_tuner’:drivers/media/usb/dvb-usb/cxusb.c:128:35: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
128 | deb_info("gpio_write failed.\n");
| ^drivers/media/usb/dvb-usb/cxusb.c: In function ‘cxusb_bluebird_gpio_rw’:drivers/media/usb/dvb-usb/cxusb.c:145:44: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
145 | deb_info("bluebird_gpio_write failed.\n");
| ^drivers/media/usb/dvb-usb/cxusb.c: In function ‘cxusb_i2c_xfer’:drivers/media/usb/dvb-usb/cxusb.c:251:42: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
251 | deb_i2c("i2c read may have failed\n");
| ^drivers/media/usb/dvb-usb/cxusb.c:274:43: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
274 | deb_i2c("i2c write may have failed\n");
| ^
Stable-dep-of: 73fb3b92da84 ("media: cxusb: no longer judge rbuf when the write fails")
--- drivers/media/usb/dvb-usb/cxusb.c | 33 ++++++++++++++----------------- 1 file changed, 15 insertions(+), 18 deletions(-)
drivers/media/usb/dvb-usb/cxusb.c +15 -18
@@ -54,9 +54,6 @@ MODULE_PARM_DESC(debug, "set debugging level (see cxusb.h)."DVB_DEFINE_MOD_OPT_ADAPTER_NR (adapter_nr); -#define deb_info(args...) dprintk(dvb_usb_cxusb_debug, CXUSB_DBG_MISC, args) -#define deb_i2c(args...) dprintk(dvb_usb_cxusb_debug, CXUSB_DBG_I2C, args) -enum cxusb_table_index {MEDION_MD95700 ,DVICO_BLUEBIRD_LG064F_COLD ,
@@ -125,7 +122,7 @@ static void cxusb_gpio_tuner(struct dvb_usb_device *d, int onoff)cxusb_ctrl_msg (d,CMD_GPIO_WRITE , o,2 , &i,1 );if (i !=0x01 ) -deb_info ("gpio_write failed.\n" ); +dev_info (&d->udev->dev,"gpio_write failed.\n" ); st->gpio_write_state[GPIO_TUNER ] = onoff; st->gpio_write_refresh[GPIO_TUNER ] = false;
@@ -142,7 +139,7 @@ static int cxusb_bluebird_gpio_rw(struct dvb_usb_device *d, u8 changemask, rc =cxusb_ctrl_msg (d,CMD_BLUEBIRD_GPIO_RW , o,2 , &gpio_state,1 );if (rc <0 || (gpio_state & changemask) != (newval & changemask)) -deb_info ("bluebird_gpio_write failed.\n" ); +dev_info (&d->udev->dev,"bluebird_gpio_write failed.\n" );return rc <0 ? rc : gpio_state; }
@@ -174,7 +171,7 @@ static int cxusb_d680_dmb_gpio_tuner(struct dvb_usb_device *d,if (i ==0x01 )return 0 ; -deb_info ("gpio_write failed.\n" ); +dev_info (&d->udev->dev,"gpio_write failed.\n" );return -EIO ; }
@@ -248,7 +245,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],break ;if (ibuf[0 ] !=0x08 ) -deb_i2c ("i2c read may have failed\n" ); +dev_info (&d->udev->dev,"i2c read may have failed\n" );memcpy (msg[i +1 ].buf, &ibuf[1 ], msg[i +1 ].len);
@@ -271,7 +268,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], 2 + msg[i].len, &ibuf, 1) < 0)break ;if (ibuf !=0x08 ) -deb_i2c ("i2c write may have failed\n" ); +dev_info (&d->udev->dev,"i2c write may have failed\n" ); } }
@@ -299,7 +296,7 @@ static int _cxusb_power_ctrl(struct dvb_usb_device *d, int onoff) {u8 b =0 ; -deb_info ("setting power %s\n" , onoff ?"ON" :"OFF" ); +dev_info (&d->udev->dev,"setting power %s\n" , onoff ?"ON" :"OFF" );if (onoff)return cxusb_ctrl_msg (d,CMD_POWER_ON , &b,1 ,NULL ,0 );
@@ -318,7 +315,7 @@ static int cxusb_power_ctrl(struct dvb_usb_device *d, int onoff)mutex_lock (&cxdev->open_lock);if (cxdev->open_type ==CXUSB_OPEN_ANALOG ) { -deb_info ("preventing DVB core from setting power OFF while we are in analog mode\n" ); +dev_info (&d->udev->dev,"preventing DVB core from setting power OFF while we are in analog mode\n" ); ret = -EBUSY ; goto ret_unlock; }
@@ -754,16 +751,16 @@ static int dvico_bluebird_xc2028_callback(void *ptr, int component,switch (command) {case XC2028_TUNER_RESET : -deb_info ("%s: XC2028_TUNER_RESET %d\n" , __func__, arg); +dev_info (&d->udev->dev,"XC2028_TUNER_RESET %d\n" , arg);cxusb_bluebird_gpio_pulse (d,0x01 ,1 );break ;case XC2028_RESET_CLK : -deb_info ("%s: XC2028_RESET_CLK %d\n" , __func__, arg); +dev_info (&d->udev->dev,"XC2028_RESET_CLK %d\n" , arg);break ;case XC2028_I2C_FLUSH :break ;default : -deb_info ("%s: unknown command %d, arg %d\n" , __func__, +dev_info (&d->udev->dev,"unknown command %d, arg %d\n" , command, arg);return -EINVAL ; }
@@ -1444,7 +1441,7 @@ int cxusb_medion_get(struct dvb_usb_device *dvbdev,if (cxdev->open_ctr ==0 ) {if (cxdev->open_type != open_type) { -deb_info ("will acquire and switch to %s\n" , +dev_info (&dvbdev->udev->dev,"will acquire and switch to %s\n" , open_type ==CXUSB_OPEN_ANALOG ?"analog" :"digital" );
@@ -1476,7 +1473,7 @@ int cxusb_medion_get(struct dvb_usb_device *dvbdev, cxdev->open_type = open_type; }else { -deb_info ("reacquired idle %s\n" , +dev_info (&dvbdev->udev->dev,"reacquired idle %s\n" , open_type ==CXUSB_OPEN_ANALOG ?"analog" :"digital" ); }
@@ -1484,8 +1481,8 @@ int cxusb_medion_get(struct dvb_usb_device *dvbdev, cxdev->open_ctr =1 ; }else if (cxdev->open_type == open_type) { cxdev->open_ctr++; -deb_info ("acquired %s\n" , open_type ==CXUSB_OPEN_ANALOG ? -"analog" :"digital" ); +dev_info (&dvbdev->udev->dev,"acquired %s\n" , + open_type ==CXUSB_OPEN_ANALOG ?"analog" :"digital" ); }else { ret = -EBUSY ; }
@@ -1511,7 +1508,7 @@ void cxusb_medion_put(struct dvb_usb_device *dvbdev)if (!WARN_ON (cxdev->open_ctr <1 )) { cxdev->open_ctr--; -deb_info ("release %s\n" , +dev_info (&dvbdev->udev->dev,"release %s\n" , cxdev->open_type ==CXUSB_OPEN_ANALOG ?"analog" :"digital" ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 3/148 mfd: max14577: Fix wakeup source leaks on device unbind
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit d905d06e64b0eb3da43af6186c132f5282197998 ]
Device can be unbound, so driver must also release memory for the wakeup source.
--- drivers/mfd/max14577.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/max14577.c +1 -0
@@ -467,6 +467,7 @@ static int max14577_i2c_remove(struct i2c_client *i2c) {struct max14577 *max14577 =i2c_get_clientdata (i2c); +device_init_wakeup (max14577->dev, false);mfd_remove_devices (max14577->dev);regmap_del_irq_chip (max14577->irq, max14577->irq_data);if (max14577->dev_type ==MAXIM_DEVICE_TYPE_MAX77836 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 30/148 media: cxusb: no longer judge rbuf when the write fails
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Adam Davis <[email protected]>
[ Upstream commit 73fb3b92da84637e3817580fa205d48065924e15 ]
syzbot reported a uninit-value in cxusb_i2c_xfer. [1]
Only when the write operation of usb_bulk_msg() in dvb_usb_generic_rw() succeeds and rlen is greater than 0, the read operation of usb_bulk_msg() will be executed to read rlen bytes of data from the dvb device into the rbuf.
In this case, although rlen is 1, the write operation failed which resulted in the dvb read operation not being executed, and ultimately variable i was not initialized.
[1]
BUG: KMSAN: uninit-value in cxusb_gpio_tuner drivers/media/usb/dvb-usb/cxusb.c:124 [inline] BUG: KMSAN: uninit-value in cxusb_i2c_xfer+0x153a/0x1a60 drivers/media/usb/dvb-usb/cxusb.c:196 cxusb_gpio_tuner drivers/media/usb/dvb-usb/cxusb.c:124 [inline] cxusb_i2c_xfer+0x153a/0x1a60 drivers/media/usb/dvb-usb/cxusb.c:196 __i2c_transfer+0xe25/0x3150 drivers/i2c/i2c-core-base.c:-1 i2c_transfer+0x317/0x4a0 drivers/i2c/i2c-core-base.c:2315 i2c_transfer_buffer_flags+0x125/0x1e0 drivers/i2c/i2c-core-base.c:2343 i2c_master_send include/linux/i2c.h:109 [inline] i2cdev_write+0x210/0x280 drivers/i2c/i2c-dev.c:183 do_loop_readv_writev fs/read_write.c:848 [inline] vfs_writev+0x963/0x14e0 fs/read_write.c:1057 do_writev+0x247/0x5c0 fs/read_write.c:1101 __do_sys_writev fs/read_write.c:1169 [inline] __se_sys_writev fs/read_write.c:1166 [inline] __x64_sys_writev+0x98/0xe0 fs/read_write.c:1166 x64_sys_call+0x2229/0x3c80 arch/x86/include/generated/asm/syscalls_64.h:21 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x1e0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- drivers/media/usb/dvb-usb/cxusb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/usb/dvb-usb/cxusb.c +1 -2
@@ -119,9 +119,8 @@ static void cxusb_gpio_tuner(struct dvb_usb_device *d, int onoff) o[0 ] =GPIO_TUNER ; o[1 ] = onoff; -cxusb_ctrl_msg (d,CMD_GPIO_WRITE , o,2 , &i,1 ); -if (i !=0x01 ) +if (!cxusb_ctrl_msg (d,CMD_GPIO_WRITE , o,2 , &i,1 ) && i !=0x01 )dev_info (&d->udev->dev,"gpio_write failed.\n" ); st->gpio_write_state[GPIO_TUNER ] = onoff;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 31/148 media: omap3isp: use sgtable-based scatterlist wrappers
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit 3de572fe2189a4a0bd80295e1f478401e739498e ]
Use common wrappers operating directly on the struct sg_table objects to fix incorrect use of scatterlists sync calls. dma_sync_sg_for_*() functions have to be called with the number of elements originally passed to dma_map_sg_*() function, not the one returned in sgtable's nents.
--- drivers/media/platform/omap3isp/ispccdc.c | 8 ++++---- drivers/media/platform/omap3isp/ispstat.c | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/media/platform/omap3isp/ispccdc.c +4 -4
@@ -446,8 +446,8 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,if (ret <0 ) goto done; -dma_sync_sg_for_cpu (isp->dev, req->table.sgt.sgl, - req->table.sgt.nents,DMA_TO_DEVICE ); +dma_sync_sgtable_for_cpu (isp->dev, &req->table.sgt, +DMA_TO_DEVICE );if (copy_from_user (req->table.addr, config->lsc, req->config.size)) {
@@ -455,8 +455,8 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc, goto done; } -dma_sync_sg_for_device (isp->dev, req->table.sgt.sgl, - req->table.sgt.nents,DMA_TO_DEVICE ); +dma_sync_sgtable_for_device (isp->dev, &req->table.sgt, +DMA_TO_DEVICE ); }spin_lock_irqsave (&ccdc->lsc.req_lock, flags);
drivers/media/platform/omap3isp/ispstat.c +2 -4
@@ -161,8 +161,7 @@ static void isp_stat_buf_sync_for_device(struct ispstat *stat,if (ISP_STAT_USES_DMAENGINE (stat))return ; -dma_sync_sg_for_device (stat->isp->dev, buf->sgt.sgl, - buf->sgt.nents,DMA_FROM_DEVICE ); +dma_sync_sgtable_for_device (stat->isp->dev, &buf->sgt,DMA_FROM_DEVICE ); } static void isp_stat_buf_sync_for_cpu(struct ispstat *stat,
@@ -171,8 +170,7 @@ static void isp_stat_buf_sync_for_cpu(struct ispstat *stat,if (ISP_STAT_USES_DMAENGINE (stat))return ; -dma_sync_sg_for_cpu (stat->isp->dev, buf->sgt.sgl, - buf->sgt.nents,DMA_FROM_DEVICE ); +dma_sync_sgtable_for_cpu (stat->isp->dev, &buf->sgt,DMA_FROM_DEVICE ); }static void isp_stat_buf_clear (struct ispstat *stat)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 4/148 dmaengine: xilinx_dma: Set dma_device directions
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gessler <[email protected]>
[ Upstream commit 7e01511443c30a55a5ae78d3debd46d4d872517e ]
Coalesce the direction bits from the enabled TX and/or RX channels into the directions bit mask of dma_device. Without this mask set, dma_get_slave_caps() in the DMAEngine fails, which prevents the driver from being used with an IIO DMAEngine buffer.
--- drivers/dma/xilinx/xilinx_dma.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/dma/xilinx/xilinx_dma.c +2 -0
@@ -2490,6 +2490,8 @@ static int xilinx_dma_chan_probe(struct xilinx_dma_device *xdev,return -EINVAL ; } + xdev->common.directions |= chan->direction; +/* Request the interrupt */ chan->irq =irq_of_parse_and_map (node,0 ); err = request_irq(chan->irq, xilinx_dma_irq_handler, IRQF_SHARED,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 5/148 md/md-bitmap: fix dm-raid max_write_behind setting
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 2afe17794cfed5f80295b1b9facd66e6f65e5002 ]
It's supposed to be COUNTER_MAX / 2, not COUNTER_MAX.
--- drivers/md/md-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/md-bitmap.c +1 -1
@@ -549,7 +549,7 @@ static int md_bitmap_new_disk_sb(struct bitmap *bitmap)* is a good choice? We choose COUNTER_MAX / 2 arbitrarily. */ write_behind = bitmap->mddev->bitmap_info.max_write_behind; -if (write_behind >COUNTER_MAX ) +if (write_behind >COUNTER_MAX /2 ) write_behind =COUNTER_MAX /2 ; sb->write_behind =cpu_to_le32 (write_behind); bitmap->mddev->bitmap_info.max_write_behind = write_behind;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 6/148 iio: pressure: zpa2326: Use aligned_s64 for the timestamp
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Cameron <[email protected]>
[ Upstream commit 886a446b76afddfad307488e95e87f23a08ffd51 ]
On x86_32 s64 fields are only 32-bit aligned. Hence force the alignment of the field and padding in the structure by using aligned_s64 instead.
--- drivers/iio/pressure/zpa2326.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/pressure/zpa2326.c +1 -1
@@ -581,7 +581,7 @@ static int zpa2326_fill_sample_buffer(struct iio_dev *indio_dev,struct {u32 pressure;u16 temperature; -u64 timestamp; +aligned_s64 timestamp; } sample;int err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 7/148 usb: potential integer overflow in usbg_make_tpg()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Yufeng <[email protected]>
[ Upstream commit 153874010354d050f62f8ae25cbb960c17633dc5 ]
The variable tpgt in usbg_make_tpg() is defined as unsigned long and is assigned to tpgt->tport_tpgt, which is defined as u16. This may cause an integer overflow when tpgt is greater than USHRT_MAX (65535). I haven't tried to trigger it myself, but it is possible to trigger it by calling usbg_make_tpg() with a large value for tpgt.
I modified the type of tpgt to match tpgt->tport_tpgt and adjusted the relevant code accordingly.
This patch is similar to commit 59c816c1f24d ("vhost/scsi: potential memory corruption").
--- drivers/usb/gadget/function/f_tcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_tcm.c +2 -2
@@ -1320,14 +1320,14 @@ static struct se_portal_group *usbg_make_tpg(struct se_wwn *wwn, struct usbg_tport *tport = container_of(wwn, struct usbg_tport, tport_wwn);struct usbg_tpg *tpg; -unsigned long tpgt; +u16 tpgt;int ret;struct f_tcm_opts *opts;unsigned i;if (strstr (name,"tpgt_" ) != name)return ERR_PTR (-EINVAL ); -if (kstrtoul (name +5 ,0 , &tpgt) || tpgt >UINT_MAX ) +if (kstrtou16 (name +5 ,0 , &tpgt))return ERR_PTR (-EINVAL ); ret = -ENODEV ;mutex_lock (&tpg_instances_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 8/148 tty: serial: uartlite: register uart driver in init
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Lewalski <[email protected]>
[ Upstream commit 6bd697b5fc39fd24e2aa418c7b7d14469f550a93 ]
When two instances of uart devices are probing, a concurrency race can occur. If one thread calls uart_register_driver function, which first allocates and assigns memory to 'uart_state' member of uart_driver structure, the other instance can bypass uart driver registration and call ulite_assign. This calls uart_add_one_port, which expects the uart driver to be fully initialized. This leads to a kernel panic due to a null pointer dereference:
[ 8.143581] BUG: kernel NULL pointer dereference, address: 00000000000002b8 [ 8.156982] #PF: supervisor write access in kernel mode [ 8.156984] #PF: error_code(0x0002) - not-present page [ 8.156986] PGD 0 P4D 0 ... [ 8.180668] RIP: 0010:mutex_lock+0x19/0x30 [ 8.188624] Call Trace: [ 8.188629] ? __die_body.cold+0x1a/0x1f [ 8.195260] ? page_fault_oops+0x15c/0x290 [ 8.209183] ? __irq_resolve_mapping+0x47/0x80 [ 8.209187] ? exc_page_fault+0x64/0x140 [ 8.209190] ? asm_exc_page_fault+0x22/0x30 [ 8.209196] ? mutex_lock+0x19/0x30 [ 8.223116] uart_add_one_port+0x60/0x440 [ 8.223122] ? proc_tty_register_driver+0x43/0x50 [ 8.223126] ? tty_register_driver+0x1ca/0x1e0 [ 8.246250] ulite_probe+0x357/0x4b0 [uartlite]
To prevent it, move uart driver registration in to init function. This will ensure that uart_driver is always registered when probe function is called.
--- drivers/tty/serial/uartlite.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/tty/serial/uartlite.c +12 -3
@@ -874,16 +874,25 @@ static struct platform_driver ulite_platform_driver = {static int __init ulite_init (void ) { +int ret; + +pr_debug ("uartlite: calling uart_register_driver()\n" ); + ret =uart_register_driver (&ulite_uart_driver); +if (ret) +return ret;pr_debug ("uartlite: calling platform_driver_register()\n" ); -return platform_driver_register (&ulite_platform_driver); + ret =platform_driver_register (&ulite_platform_driver); +if (ret) +uart_unregister_driver (&ulite_uart_driver); + +return ret; } static void __exit ulite_exit(void) {platform_driver_unregister (&ulite_platform_driver); -if (ulite_uart_driver.state) -uart_unregister_driver (&ulite_uart_driver); +uart_unregister_driver (&ulite_uart_driver); }module_init (ulite_init);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 9/148 usb: Add checks for snprintf() calls in usb_alloc_dev()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 82fe5107fa3d21d6c3fba091c9dbc50495588630 ]
When creating a device path in the driver the snprintf() takes up to 16 characters long argument along with the additional up to 12 characters for the signed integer (as it can't see the actual limits) and tries to pack this into 16 bytes array. GCC complains about that when build with make W=1:
drivers/usb/core/usb.c:705:25: note: ‘snprintf’ output between 3 and 28 bytes into a destination of size 16
Since everything works until now, let's just check for the potential buffer overflow and bail out. It is most likely a never happen situation, but at least it makes GCC happy.
--- drivers/usb/core/usb.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/usb/core/usb.c +10 -4
@@ -717,15 +717,16 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,dev_set_name (&dev->dev,"usb%d" , bus->busnum); root_hub =1 ; }else { +int n; +/* match any labeling on the hubs; it's one-based */ if (parent->devpath[0 ] =='0' ) { -snprintf (dev->devpath,sizeof dev->devpath, -"%d" , port1); + n =snprintf (dev->devpath,sizeof (dev->devpath),"%d" , port1);/* Root ports are not counted in route string */ dev->route =0 ; }else { -snprintf (dev->devpath,sizeof dev->devpath, -"%s.%d" , parent->devpath, port1); + n =snprintf (dev->devpath,sizeof (dev->devpath),"%s.%d" , + parent->devpath, port1);/* Route string assumes hubs have less than 16 ports */ if (port1 <15 ) dev->route = parent->route +
@@ -734,6 +735,11 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, dev->route = parent->route + (15 << ((parent->level -1 )*4 )); } +if (n >=sizeof (dev->devpath)) { +usb_put_hcd (bus_to_hcd (bus)); +usb_put_dev (dev); +return NULL ; + } dev->dev.parent = &parent->dev;dev_set_name (&dev->dev,"%d-%s" , bus->busnum, dev->devpath);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainercover 5.4.296-rc1 review
This is the start of the stable review cycle for the 5.4.296 release. There are 148 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 Thu, 17 Jul 2025 13:07:32 +0000. 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/v5.x/stable-review/patch-5.4.296-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-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.296-rc1
Georg Kohmann <[email protected]>
net: ipv6: Discard next-hop MTU less than minimum link MTU
Jann Horn <[email protected]>
x86/mm: Disable hugetlb page table sharing on 32-bit
Hans de Goede <[email protected]>
Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID
Chia-Lin Kao (AceLan) <[email protected]>
HID: quirks: Add quirk for 2 Chicony Electronics HP 5MP Cameras
Zhang Heng <[email protected]>
HID: Add IGNORE quirk for SMARTLINKTECHNOLOGY
Nicolas Pitre <[email protected]>
vt: add missing notification when switching back to text mode
Xiaowei Li <[email protected]>
net: usb: qmi_wwan: add SIMCom 8230C composition
Thomas Fourier <[email protected]>
atm: idt77252: Add missing `dma_map_error()`
Somnath Kotur <[email protected]>
bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT
Shravya KN <[email protected]>
bnxt_en: Fix DCB ETS validation
Sean Nyekjaer <[email protected]>
can: m_can: m_can_handle_lost_msg(): downgrade msg lost in rx message to debug level
Oleksij Rempel <[email protected]>
net: phy: microchip: limit 100M workaround to link-down events on LAN88xx
Kito Xu <[email protected]>
net: appletalk: Fix device refcount leak in atrtr_create()
Wang Jinchao <[email protected]>
md/raid1: Fix stack memory use after return in raid1_reshape
Daniil Dulov <[email protected]>
wifi: zd1211rw: Fix potential NULL pointer dereference in zd_mac_tx_to_dev()
Christian König <[email protected]>
dma-buf: fix timeout handling in dma_resv_wait_timeout v2
Nilton Perim Neto <[email protected]>
Input: xpad - support Acer NGR 200 Controller
Vicki Pfau <[email protected]>
Input: xpad - add VID for Turtle Beach controllers
Matt Reynolds <[email protected]>
Input: xpad - add support for Amazon Game Controller
Trond Myklebust <[email protected]>
NFSv4/flexfiles: Fix handling of NFS level errors in I/O
Tigran Mkrtchyan <[email protected]>
flexfiles/pNFS: update stats on NFS4ERR_DELAY for v4.1 DSes
Patrisious Haddad <[email protected]>
RDMA/mlx5: Fix vport loopback for MPV device
Kuniyuki Iwashima <[email protected]>
netlink: Fix rmem check in netlink_broadcast_deliver().
Jakub Kicinski <[email protected]>
netlink: make sure we allow at least one dump skb
Uwe Kleine-König <[email protected]>
pwm: mediatek: Ensure to disable clocks in error path
Rafael J. Wysocki <[email protected]>
Revert "ACPI: battery: negate current when discharging"
Kuen-Han Tsai <[email protected]>
usb: gadget: u_serial: Fix race condition in TTY wakeup
Matthew Brost <[email protected]>
drm/sched: Increment job count before swapping tail spsc queue
Bartosz Golaszewski <[email protected]>
pinctrl: qcom: msm: mark certain pins as invalid for interrupts
JP Kobryn <[email protected]>
x86/mce: Make sure CMCI banks are cleared during shutdown on Intel
Yazen Ghannam <[email protected]>
x86/mce: Don't remove sysfs if thresholding sysfs init fails
Yazen Ghannam <[email protected]>
x86/mce/amd: Fix threshold limit reset
David Howells <[email protected]>
rxrpc: Fix oops due to non-existence of prealloc backlog struct
Victor Nogueira <[email protected]>
net/sched: Abort __tc_modify_qdisc if parent class does not exist
Yue Haibing <[email protected]>
atm: clip: Fix NULL pointer dereference in vcc_sendmsg()
Kuniyuki Iwashima <[email protected]>
atm: clip: Fix infinite recursive call of clip_push().
Kuniyuki Iwashima <[email protected]>
atm: clip: Fix memory leak of struct clip_vcc.
Kuniyuki Iwashima <[email protected]>
atm: clip: Fix potential null-ptr-deref in to_atmarpd().
Kuniyuki Iwashima <[email protected]>
tipc: Fix use-after-free in tipc_conn_close().
Kuniyuki Iwashima <[email protected]>
netlink: Fix wraparounds of sk->sk_rmem_alloc.
Al Viro <[email protected]>
fix proc_sys_compare() handling of in-lookup dentries
Eric W. Biederman <[email protected]>
proc: Clear the pieces of proc_inode that proc_evict_inode cares about
Kaustabh Chakraborty <[email protected]>
drm/exynos: exynos7_drm_decon: add vblank check in IRQ handling
Nathan Chancellor <[email protected]>
staging: rtl8723bs: Avoid memset() in aes_cipher() and aes_decipher()
Ricardo Ribalda <[email protected]>
media: uvcvideo: Rollback non processed entities on error
Ricardo Ribalda <[email protected]>
media: uvcvideo: Send control events for partial succeeds
Ricardo Ribalda <[email protected]>
media: uvcvideo: Return the number of processed controls
Seiji Nishikawa <[email protected]>
ACPI: PAD: fix crash in exit_round_robin()
Andrei Kuchynski <[email protected]>
usb: typec: displayport: Fix potential deadlock
Oliver Neukum <[email protected]>
Logitech C-270 even more broken
Kohei Enju <[email protected]>
rose: fix dangling neighbour pointers in rose_rt_device_down()
Gustavo A. R. Silva <[email protected]>
net: rose: Fix fall-through warnings for Clang
Janusz Krzysztofik <[email protected]>
drm/i915/gt: Fix timeline left held on VMA alloc error
Dan Carpenter <[email protected]>
drm/i915/selftests: Change mock_request() to return error pointers
James Clark <[email protected]>
spi: spi-fsl-dspi: Clear completion counter before initiating transfer
Vladimir Oltean <[email protected]>
spi: spi-fsl-dspi: Fix interrupt-less DMA mode taking an XSPI code path
Vladimir Oltean <[email protected]>
spi: spi-fsl-dspi: Rename fifo_{read,write} and {tx,cmd}_fifo_write
Fushuai Wang <[email protected]>
dpaa2-eth: fix xdp_rxq_info leak
Thomas Fourier <[email protected]>
ethernet: atl1: Add missing DMA mapping error checks and count errors
Filipe Manana <[email protected]>
btrfs: use btrfs_record_snapshot_destroy() during rmdir
Filipe Manana <[email protected]>
btrfs: propagate last_unlink_trans earlier when doing a rmdir
Patrisious Haddad <[email protected]>
RDMA/mlx5: Fix CC counters query for MPV
Leon Romanovsky <[email protected]>
RDMA/core: Create and destroy counters in the ib_core
Bart Van Assche <[email protected]>
scsi: ufs: core: Fix spelling of a sysfs attribute name
Maíra Canal <[email protected]>
drm/v3d: Disable interrupts before resetting the GPU
Sergey Senozhatsky <[email protected]>
mtk-sd: reset host->mrq on prepare_data() error
Masami Hiramatsu (Google) <[email protected]>
mtk-sd: Prevent memory corruption from DMA map failure
Yue Hu <[email protected]>
mmc: mediatek: use data instead of mrq parameter from msdc_{un}prepare_data()
Manivannan Sadhasivam <[email protected]>
regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods
Jerome Neanne <[email protected]>
regulator: gpio: Add input_supply support in gpio_regulator_config
Uladzislau Rezki (Sony) <[email protected]>
rcu: Return early if callback is not specified
Rafael J. Wysocki <[email protected]>
ACPICA: Refuse to evaluate a method if arguments are missing
Johannes Berg <[email protected]>
wifi: ath6kl: remove WARN on bad firmware input
Johannes Berg <[email protected]>
wifi: mac80211: drop invalid source address OCB frames
Madhavan Srinivasan <[email protected]>
powerpc: Fix struct termio related ioctl macros
Johannes Berg <[email protected]>
ata: pata_cs5536: fix build on 32-bit UML
Takashi Iwai <[email protected]>
ALSA: sb: Force to disable DMAs once when DMA mode is changed
Lion Ackermann <[email protected]>
net/sched: Always pass notifications when child class becomes empty
Thomas Fourier <[email protected]>
nui: Fix dma_mapping_error() check
Alok Tiwari <[email protected]>
enic: fix incorrect MTU comparison in enic_change_mtu()
Raju Rangoju <[email protected]>
amd-xgbe: align CL37 AN sequence as per databook
Dan Carpenter <[email protected]>
lib: test_objagg: Set error message in check_expect_hints_stats()
Marek Szyprowski <[email protected]>
drm/exynos: fimd: Guard display clock control with runtime PM calls
Filipe Manana <[email protected]>
btrfs: fix missing error handling when searching for inode refs during log replay
Thomas Fourier <[email protected]>
scsi: qla4xxx: Fix missing DMA mapping error in qla4xxx_alloc_pdu()
Kuniyuki Iwashima <[email protected]>
nfs: Clean up /proc/net/rpc/nfs when nfs_fs_proc_net_init() fails.
Mark Zhang <[email protected]>
RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insert
David Thompson <[email protected]>
platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignment
Masami Hiramatsu (Google) <[email protected]>
mtk-sd: Fix a pagefault in dma_unmap_sg() for not prepared data
RD Babiera <[email protected]>
usb: typec: altmodes/displayport: do not index invalid pin_assignments
Ulf Hansson <[email protected]>
Revert "mmc: sdhci: Disable SD card clock before changing parameters"
Victor Shih <[email protected]>
mmc: sdhci: Add a helper function for dump register in dynamic debug mode
HarshaVardhana S A <[email protected]>
vsock/vmci: Clear the vmci transport packet properly when initializing it
Omar Sandoval <[email protected]>
btrfs: don't abort filesystem when attempting to snapshot deleted subvolume
Dev Jain <[email protected]>
arm64: Restrict pagetable teardown to avoid false warning
Nathan Chancellor <[email protected]>
s390: Add '-std=gnu11' to decompressor and purgatory CFLAGS
Aradhya Bhatia <[email protected]>
drm/bridge: cdns-dsi: Check return value when getting default PHY config
Aradhya Bhatia <[email protected]>
drm/bridge: cdns-dsi: Fix connecting to next bridge
Aradhya Bhatia <[email protected]>
drm/bridge: cdns-dsi: Fix the clock variable for mode_valid()
Thierry Reding <[email protected]>
drm/tegra: Assign plane type before registration
Qasim Ijaz <[email protected]>
HID: wacom: fix kobject reference count leak
Qasim Ijaz <[email protected]>
HID: wacom: fix memory leak on sysfs attribute creation failure
Qasim Ijaz <[email protected]>
HID: wacom: fix memory leak on kobject creation failure
Heinz Mauelshagen <[email protected]>
dm-raid: fix variable in journal device check
Frédéric Danis <[email protected]>
Bluetooth: L2CAP: Fix L2CAP MTU negotiation
Kuniyuki Iwashima <[email protected]>
atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister().
Simon Horman <[email protected]>
net: enetc: Correct endianness handling in _enetc_rd_reg64
Tiwei Bie <[email protected]>
um: ubd: Add missing error check in start_io_thread()
Stefano Garzarella <[email protected]>
vsock/uapi: fix linux/vm_sockets.h userspace compilation errors
Lachlan Hodges <[email protected]>
wifi: mac80211: fix beacon interval calculation overflow
Al Viro <[email protected]>
attach_recursive_mnt(): do not lock the covering tree when sliding something under it
Youngjun Lee <[email protected]>
ALSA: usb-audio: Fix out-of-bounds read in snd_usb_get_audioformat_uac3()
Wolfram Sang <[email protected]>
i2c: robotfuzz-osif: disable zero-length read messages
Wolfram Sang <[email protected]>
i2c: tiny-usb: disable zero-length read messages
Shin'ichiro Kawasaki <[email protected]>
RDMA/iwcm: Fix use-after-free of work objects after cm_id destruction
Weihang Li <[email protected]>
RDMA/core: Use refcount_t instead of atomic_t on refcount of iwcm_id_private
Denis Arefev <[email protected]>
media: vivid: Change the siize of the composing
Marek Szyprowski <[email protected]>
media: omap3isp: use sgtable-based scatterlist wrappers
Edward Adam Davis <[email protected]>
media: cxusb: no longer judge rbuf when the write fails
Sean Young <[email protected]>
media: cxusb: use dev_dbg() rather than hand-rolled debug
Vasiliy Kovalev <[email protected]>
jfs: validate AG parameters in dbMount() to prevent crashes
Dave Kleikamp <[email protected]>
fs/jfs: consolidate sanity checking in dbMount
Martin Blumenstingl <[email protected]>
ASoC: meson: meson-card-utils: use of_property_present() for DT parsing
Rob Herring <[email protected]>
of: Add of_property_present() helper
Michael Walle <[email protected]>
of: property: define of_property_read_u{8,16,32,64}_array() unconditionallyArnd Bergmann <[email protected]>
kbuild: hdrcheck: fix cross build with clang
Masahiro Yamada <[email protected]>
kbuild: add --target to correctly cross-compile UAPI headers with Clang
Masahiro Yamada <[email protected]>
bpfilter: match bit size of bpfilter_umh to that of the kernel
Masahiro Yamada <[email protected]>
kbuild: use -MMD instead of -MD to exclude system headers from dependency
Wupeng Ma <[email protected]>
VMCI: fix race between vmci_host_setup_notify and vmci_ctx_unset_notify
George Kennedy <[email protected]>
VMCI: check context->notify_page after call to get_user_pages_fast() to avoid GPF
Dave Penkler <[email protected]>
usb: usbtmc: Fix read_stb function and get_stb ioctl
Dave Penkler <[email protected]>
USB: usbtmc: Add USBTMC_IOCTL_GET_STB
Dave Penkler <[email protected]>
USB: usbtmc: Fix reading stale status byte
Kees Cook <[email protected]>
ovl: Check for NULL d_inode() in ovl_dentry_upper()
Dmitry Kandybka <[email protected]>
ceph: fix possible integer overflow in ceph_zero_objects()
Cezary Rojewski <[email protected]>
ALSA: hda: Ignore unsol events for cards being shut down
Jos Wang <[email protected]>
usb: typec: displayport: Receive DP Status Update NAK request exit dp altmode
Robert Hodaszi <[email protected]>
usb: cdc-wdm: avoid setting WDM_READ for ZLP-s
Andy Shevchenko <[email protected]>
usb: Add checks for snprintf() calls in usb_alloc_dev()
Jakub Lewalski <[email protected]>
tty: serial: uartlite: register uart driver in init
Chen Yufeng <[email protected]>
usb: potential integer overflow in usbg_make_tpg()
Jonathan Cameron <[email protected]>
iio: pressure: zpa2326: Use aligned_s64 for the timestamp
Yu Kuai <[email protected]>
md/md-bitmap: fix dm-raid max_write_behind setting
Thomas Gessler <[email protected]>
dmaengine: xilinx_dma: Set dma_device directions
Krzysztof Kozlowski <[email protected]>
mfd: max14577: Fix wakeup source leaks on device unbind
Peng Fan <[email protected]>
mailbox: Not protect module_put with spin_lock_irqsave
Pali Rohár <[email protected]>
cifs: Fix cifs_query_path_info() for Windows NT servers
-------------
Diffstat:
Documentation/ABI/testing/sysfs-driver-ufs | 2 +- Makefile | 4 +- arch/arm64/mm/mmu.c | 3 +- arch/powerpc/include/uapi/asm/ioctls.h | 8 +- arch/s390/Makefile | 2 +- arch/s390/purgatory/Makefile | 2 +- arch/um/drivers/ubd_user.c | 2 +- arch/x86/Kconfig | 2 +- arch/x86/kernel/cpu/mce/amd.c | 15 +- arch/x86/kernel/cpu/mce/core.c | 8 +- arch/x86/kernel/cpu/mce/intel.c | 1 + drivers/acpi/acpi_pad.c | 7 +- drivers/acpi/acpica/dsmethod.c | 7 + drivers/acpi/battery.c | 19 +- drivers/ata/pata_cs5536.c | 2 +- drivers/atm/idt77252.c | 5 + drivers/dma-buf/dma-resv.c | 5 +- drivers/dma/xilinx/xilinx_dma.c | 2 + drivers/gpu/drm/bridge/cdns-dsi.c | 11 +- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 12 + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 3 +- drivers/gpu/drm/i915/selftests/i915_request.c | 20 +- drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- drivers/gpu/drm/tegra/dc.c | 12 +- drivers/gpu/drm/tegra/hub.c | 4 +- drivers/gpu/drm/tegra/hub.h | 3 +- drivers/gpu/drm/v3d/v3d_drv.h | 9 + drivers/gpu/drm/v3d/v3d_gem.c | 2 + drivers/gpu/drm/v3d/v3d_irq.c | 36 ++- drivers/hid/hid-ids.h | 5 + drivers/hid/hid-quirks.c | 3 + drivers/hid/wacom_sys.c | 6 +- drivers/i2c/busses/i2c-robotfuzz-osif.c | 6 + drivers/i2c/busses/i2c-tiny-usb.c | 6 + drivers/iio/pressure/zpa2326.c | 2 +- drivers/infiniband/core/device.c | 1 + drivers/infiniband/core/iwcm.c | 38 +-- drivers/infiniband/core/iwcm.h | 2 +- .../infiniband/core/uverbs_std_types_counters.c | 17 +- drivers/infiniband/hw/mlx5/devx.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 55 ++-- drivers/input/joystick/xpad.c | 5 + drivers/input/keyboard/atkbd.c | 3 +- drivers/mailbox/mailbox.c | 2 +- drivers/md/dm-raid.c | 2 +- drivers/md/md-bitmap.c | 2 +- drivers/md/raid1.c | 1 + drivers/media/platform/omap3isp/ispccdc.c | 8 +- drivers/media/platform/omap3isp/ispstat.c | 6 +- drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- drivers/media/usb/dvb-usb/cxusb.c | 36 ++- drivers/media/usb/uvc/uvc_ctrl.c | 61 +++-- drivers/mfd/max14577.c | 1 + drivers/misc/vmw_vmci/vmci_host.c | 9 +- drivers/mmc/host/mtk-sd.c | 39 ++- drivers/mmc/host/sdhci.c | 9 +- drivers/mmc/host/sdhci.h | 16 ++ drivers/net/can/m_can/m_can.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 9 + drivers/net/ethernet/amd/xgbe/xgbe.h | 4 +- drivers/net/ethernet/atheros/atlx/atl1.c | 78 ++++-- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- drivers/net/ethernet/cisco/enic/enic_main.c | 4 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 26 +- drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 +- drivers/net/ethernet/sun/niu.c | 31 ++- drivers/net/ethernet/sun/niu.h | 4 + drivers/net/phy/microchip.c | 2 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wireless/ath/ath6kl/bmi.c | 4 +- drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 6 +- drivers/pinctrl/qcom/pinctrl-msm.c | 20 ++ drivers/platform/mellanox/mlxbf-tmfifo.c | 3 +- drivers/pwm/pwm-mediatek.c | 15 +- drivers/regulator/gpio-regulator.c | 19 +- drivers/scsi/qla4xxx/ql4_os.c | 2 + drivers/scsi/ufs/ufs-sysfs.c | 4 +- drivers/spi/spi-fsl-dspi.c | 55 ++-- drivers/staging/rtl8723bs/core/rtw_security.c | 46 +--- drivers/tty/serial/uartlite.c | 15 +- drivers/tty/vt/vt.c | 1 + drivers/usb/class/cdc-wdm.c | 23 +- drivers/usb/class/usbtmc.c | 53 ++-- drivers/usb/core/quirks.c | 3 +- drivers/usb/core/usb.c | 14 +- drivers/usb/gadget/function/f_tcm.c | 4 +- drivers/usb/gadget/function/u_serial.c | 6 +- drivers/usb/typec/altmodes/displayport.c | 5 +- fs/btrfs/inode.c | 36 +-- fs/btrfs/ioctl.c | 3 + fs/btrfs/tree-log.c | 4 +- fs/ceph/file.c | 2 +- fs/cifs/misc.c | 8 + fs/jfs/jfs_dmap.c | 41 +-- fs/namespace.c | 8 +- fs/nfs/flexfilelayout/flexfilelayout.c | 144 +++++++--- fs/nfs/inode.c | 17 +- fs/overlayfs/util.c | 4 +- fs/proc/inode.c | 16 +- fs/proc/proc_sysctl.c | 18 +- include/drm/spsc_queue.h | 4 +- include/linux/of.h | 291 ++++++++++----------- include/linux/regulator/gpio-regulator.h | 2 + include/linux/usb/typec_dp.h | 1 + include/rdma/ib_verbs.h | 7 +- include/uapi/linux/usb/tmc.h | 2 + include/uapi/linux/vm_sockets.h | 4 + init/Kconfig | 4 +- kernel/rcu/tree.c | 4 + lib/test_objagg.c | 4 +- net/appletalk/ddp.c | 1 + net/atm/clip.c | 64 +++-- net/atm/resources.c | 3 +- net/bluetooth/l2cap_core.c | 9 +- net/bpfilter/Makefile | 5 +- net/ipv6/route.c | 3 +- net/mac80211/rx.c | 4 + net/mac80211/util.c | 2 +- net/netlink/af_netlink.c | 90 ++++--- net/rose/rose_route.c | 15 +- net/rxrpc/call_accept.c | 3 + net/sched/sch_api.c | 42 +-- net/tipc/topsrv.c | 2 + net/vmw_vsock/vmci_transport.c | 4 +- scripts/Kbuild.include | 2 +- scripts/Makefile.host | 4 +- scripts/Makefile.lib | 8 +- sound/isa/sb/sb16_main.c | 4 + sound/pci/hda/hda_bind.c | 2 +- sound/soc/meson/meson-card-utils.c | 2 +- sound/usb/stream.c | 2 + usr/include/Makefile | 6 +- 135 files changed, 1221 insertions(+), 706 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 33/148 RDMA/core: Use refcount_t instead of atomic_t on refcount of iwcm_id_private
5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weihang Li <[email protected]>
[ Upstream commit 60dff56d77292062789232f68354f567e1ccf1d2 ]
The refcount_t API will WARN on underflow and overflow of a reference counter, and avoid use-after-free risks.
Stable-dep-of: 6883b680e703 ("RDMA/iwcm: Fix use-after-free of work objects after cm_id destruction")
--- drivers/infiniband/core/iwcm.c | 9 ++++----- drivers/infiniband/core/iwcm.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/infiniband/core/iwcm.c +4 -5
@@ -211,8 +211,7 @@ static void free_cm_id(struct iwcm_id_private *cm_id_priv)*/ static int iwcm_deref_id (struct iwcm_id_private *cm_id_priv) { -BUG_ON (atomic_read (&cm_id_priv->refcount)==0 ); -if (atomic_dec_and_test (&cm_id_priv->refcount)) { +if (refcount_dec_and_test (&cm_id_priv->refcount)) {BUG_ON (!list_empty (&cm_id_priv->work_list));free_cm_id (cm_id_priv);return 1 ;
@@ -225,7 +224,7 @@ static void add_ref(struct iw_cm_id *cm_id) {struct iwcm_id_private *cm_id_priv; cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); -atomic_inc (&cm_id_priv->refcount); +refcount_inc (&cm_id_priv->refcount); }static void rem_ref (struct iw_cm_id *cm_id)
@@ -257,7 +256,7 @@ struct iw_cm_id *iw_create_cm_id(struct ib_device *device, cm_id_priv->id.add_ref = add_ref; cm_id_priv->id.rem_ref = rem_ref;spin_lock_init (&cm_id_priv->lock); -atomic_set (&cm_id_priv->refcount,1 ); +refcount_set (&cm_id_priv->refcount,1 );init_waitqueue_head (&cm_id_priv->connect_wait);init_completion (&cm_id_priv->destroy_comp);INIT_LIST_HEAD (&cm_id_priv->work_list);
@@ -1097,7 +1096,7 @@ static int cm_event_handler(struct iw_cm_id *cm_id, } } -atomic_inc (&cm_id_priv->refcount); +refcount_inc (&cm_id_priv->refcount);if (list_empty (&cm_id_priv->work_list)) {list_add_tail (&work->list, &cm_id_priv->work_list);queue_work (iwcm_wq, &work->work);
drivers/infiniband/core/iwcm.h +1 -1
@@ -52,7 +52,7 @@ struct iwcm_id_private {wait_queue_head_t connect_wait;struct list_head work_list;spinlock_t lock; -atomic_t refcount; +refcount_t refcount;struct list_head work_free_list; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 42/148 net: enetc: Correct endianness handling in _enetc_rd_reg64
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Horman <[email protected]>
[ Upstream commit 7b515f35a911fdc31fbde6531828dcd6ae9803d3 ]
enetc_hw.h provides two versions of _enetc_rd_reg64. One which simply calls ioread64() when available.
And another that composes the 64-bit result from ioread32() calls.
In the second case the code appears to assume that each ioread32() call returns a little-endian value. However both the shift and logical or used to compose the return value would not work correctly on big endian systems if this were the case. Moreover, this is inconsistent with the first case where the return value of ioread64() is assumed to be in host byte order.
It appears that the correct approach is for both versions to treat the return value of ioread*() functions as being in host byte order. And this patch corrects the ioread32()-based version to do so.
This is a bug but would only manifest on big endian systems that make use of the ioread32-based implementation of _enetc_rd_reg64. While all in-tree users of this driver are little endian and make use of the ioread64-based implementation of _enetc_rd_reg64. Thus, no in-tree user of this driver is affected by this bug.
Flagged by Sparse.
Compile tested only.
--- drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -1
@@ -319,7 +319,7 @@ static inline u64 enetc_rd_reg64(void __iomem *reg) tmp = ioread32(reg + 4); }while (high != tmp); -return le64_to_cpu ((__le64 )high <<32 | low); +return (u64 )high <<32 | low; }#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 43/148 atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister().
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit a433791aeaea6e84df709e0b9584b9bbe040cd1c ]
syzbot reported a warning below during atm_dev_register(). [0]
Before creating a new device and procfs/sysfs for it, atm_dev_register() looks up a duplicated device by __atm_dev_lookup(). These operations are done under atm_dev_mutex.
However, when removing a device in atm_dev_deregister(), it releases the mutex just after removing the device from the list that __atm_dev_lookup() iterates over.
So, there will be a small race window where the device does not exist on the device list but procfs/sysfs are still not removed, triggering the splat.
Let's hold the mutex until procfs/sysfs are removed in atm_dev_deregister().
[0]:proc_dir_entry 'atm/atmtcp:0' already registered
WARNING: CPU: 0 PID: 5919 at fs/proc/generic.c:377 proc_register+0x455/0x5f0 fs/proc/generic.c:377 Modules linked in: CPU: 0 UID: 0 PID: 5919 Comm: syz-executor284 Not tainted 6.16.0-rc2-syzkaller-00047-g52da431bf03b #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 RIP: 0010:proc_register+0x455/0x5f0 fs/proc/generic.c:377 Code: 48 89 f9 48 c1 e9 03 80 3c 01 00 0f 85 a2 01 00 00 48 8b 44 24 10 48 c7 c7 20 c0 c2 8b 48 8b b0 d8 00 00 00 e8 0c 02 1c ff 90 <0f> 0b 90 90 48 c7 c7 80 f2 82 8e e8 0b de 23 09 48 8b 4c 24 28 48 RSP: 0018:ffffc9000466fa30 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffff817ae248 RDX: ffff888026280000 RSI: ffffffff817ae255 RDI: 0000000000000001 RBP: ffff8880232bed48 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000001 R12: ffff888076ed2140 R13: dffffc0000000000 R14: ffff888078a61340 R15: ffffed100edda444 FS: 00007f38b3b0c6c0(0000) GS:ffff888124753000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f38b3bdf953 CR3: 0000000076d58000 CR4: 00000000003526f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> proc_create_data+0xbe/0x110 fs/proc/generic.c:585 atm_proc_dev_register+0x112/0x1e0 net/atm/proc.c:361 atm_dev_register+0x46d/0x890 net/atm/resources.c:113 atmtcp_create+0x77/0x210 drivers/atm/atmtcp.c:369 atmtcp_attach drivers/atm/atmtcp.c:403 [inline] atmtcp_ioctl+0x2f9/0xd60 drivers/atm/atmtcp.c:464 do_vcc_ioctl+0x12c/0x930 net/atm/ioctl.c:159 sock_do_ioctl+0x115/0x280 net/socket.c:1190 sock_ioctl+0x227/0x6b0 net/socket.c:1311 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __x64_sys_ioctl+0x18b/0x210 fs/ioctl.c:893 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x4c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f38b3b74459 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 51 18 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f38b3b0c198 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f38b3bfe318 RCX: 00007f38b3b74459 RDX: 0000000000000000 RSI: 0000000000006180 RDI: 0000000000000005 RBP: 00007f38b3bfe310 R08: 65732f636f72702f R09: 65732f636f72702f R10: 65732f636f72702f R11: 0000000000000246 R12: 00007f38b3bcb0ac R13: 00007f38b3b0c1a0 R14: 0000200000000200 R15: 00007f38b3bcb03b </TASK>
--- net/atm/resources.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/atm/resources.c +1 -2
@@ -148,11 +148,10 @@ void atm_dev_deregister(struct atm_dev **/ mutex_lock (&atm_dev_mutex);list_del (&dev->dev_list); -mutex_unlock (&atm_dev_mutex); -atm_dev_release_vccs (dev);atm_unregister_sysfs (dev);atm_proc_dev_deregister (dev); +mutex_unlock (&atm_dev_mutex);atm_dev_put (dev); }
Greg Kroah-Hartman
maintainerPATCH 44/148 Bluetooth: L2CAP: Fix L2CAP MTU negotiation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frédéric Danis <[email protected]>
commit 042bb9603c44620dce98717a2d23235ca57a00d7 upstream.
OBEX download from iPhone is currently slow due to small packet size used to transfer data which doesn't follow the MTU negotiated during L2CAP connection, i.e. 672 bytes instead of 32767:
< ACL Data TX: Handle 11 flags 0x00 dlen 12
L2CAP: Connection Request (0x02) ident 18 len 4
PSM: 4103 (0x1007)
Source CID: 72Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 16
L2CAP: Connection Response (0x03) ident 18 len 8
Destination CID: 14608
Source CID: 72
Result: Connection successful (0x0000)
Status: No further information available (0x0000)
< ACL Data TX: Handle 11 flags 0x00 dlen 27
L2CAP: Configure Request (0x04) ident 20 len 19
Destination CID: 14608
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 26
L2CAP: Configure Request (0x04) ident 72 len 18
Destination CID: 72
Flags: 0x0000
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 65527
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)
< ACL Data TX: Handle 11 flags 0x00 dlen 29
L2CAP: Configure Response (0x05) ident 72 len 21
Source CID: 14608
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 672
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 32
L2CAP: Configure Response (0x05) ident 20 len 24
Source CID: 72
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)...
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 680
Channel: 72 len 676 ctrl 0x0202 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Unsegmented TxSeq 1 ReqSeq 2
< ACL Data TX: Handle 11 flags 0x00 dlen 13
Channel: 14608 len 9 ctrl 0x0204 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Unsegmented TxSeq 2 ReqSeq 2
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 680
Channel: 72 len 676 ctrl 0x0304 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Unsegmented TxSeq 2 ReqSeq 3
The MTUs are negotiated for each direction. In this traces 32767 for iPhone->localhost and no MTU for localhost->iPhone, which based on '4.4 L2CAP_CONFIGURATION_REQ' (Core specification v5.4, Vol. 3, Part A):
The only parameters that should be included in the L2CAP_CONFIGURATION_REQ packet are those that require different values than the default or previously agreed values.
...
Any missing configuration parameters are assumed to have their most recently explicitly or implicitly accepted values.
and '5.1 Maximum transmission unit (MTU)':
If the remote device sends a positive L2CAP_CONFIGURATION_RSP packet it should include the actual MTU to be used on this channel for traffic flowing into the local device.
...
The default value is 672 octets.
is set by BlueZ to 672 bytes.
It seems that the iPhone used the lowest negotiated value to transfer data to the localhost instead of the negotiated one for the incoming direction.
This could be fixed by using the MTU negotiated for the other direction, if exists, in the L2CAP_CONFIGURATION_RSP. This allows to use segmented packets as in the following traces:
< ACL Data TX: Handle 11 flags 0x00 dlen 12
L2CAP: Connection Request (0x02) ident 22 len 4
PSM: 4103 (0x1007)
Source CID: 72
< ACL Data TX: Handle 11 flags 0x00 dlen 27
L2CAP: Configure Request (0x04) ident 24 len 19
Destination CID: 2832
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 26
L2CAP: Configure Request (0x04) ident 15 len 18
Destination CID: 72
Flags: 0x0000
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 65527
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)
< ACL Data TX: Handle 11 flags 0x00 dlen 29
L2CAP: Configure Response (0x05) ident 15 len 21
Source CID: 2832
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 32
L2CAP: Configure Response (0x05) ident 24 len 24
Source CID: 72
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)...
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 1009
Channel: 72 len 1005 ctrl 0x4202 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Start (len 21884) TxSeq 1 ReqSeq 2Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 1009
Channel: 72 len 1005 ctrl 0xc204 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Continuation TxSeq 2 ReqSeq 2
This has been tested with kernel 5.4 and BlueZ 5.77.
--- net/bluetooth/l2cap_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +8 -1
@@ -3373,7 +3373,7 @@ static int l2cap_parse_conf_req(struct lstruct l2cap_conf_rfc rfc = { .mode =L2CAP_MODE_BASIC };struct l2cap_conf_efs efs;u8 remote_efs =0 ; -u16 mtu =L2CAP_DEFAULT_MTU ; +u16 mtu =0 ;u16 result =L2CAP_CONF_SUCCESS ;u16 size;
@@ -3484,6 +3484,13 @@ done:/* Configure output options and let the other side know * which ones we don't like. */ +/* If MTU is not provided in configure request, use the most recently +* explicitly or implicitly accepted value for the other direction, +* or the default value. +*/ +if (mtu ==0 ) + mtu = chan->imtu ? chan->imtu :L2CAP_DEFAULT_MTU ; +if (mtu <L2CAP_DEFAULT_MIN_MTU ) result =L2CAP_CONF_UNACCEPT ;else {
Greg Kroah-Hartman
maintainerPATCH 45/148 dm-raid: fix variable in journal device check
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heinz Mauelshagen <[email protected]>
commit db53805156f1e0aa6d059c0d3f9ac660d4ef3eb4 upstream.
Replace "rdev" with correct loop variable name "r".
--- drivers/md/dm-raid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-raid.c +1 -1
@@ -2406,7 +2406,7 @@ static int super_init_validation(struct*/ sb_retrieve_failed_devices (sb, failed_devices);rdev_for_each (r, mddev) { -if (test_bit (Journal, &rdev->flags) || +if (test_bit (Journal, &r->flags) || !r->sb_page)continue ; sb2 =page_address (r->sb_page);
Greg Kroah-Hartman
maintainerPATCH 46/148 HID: wacom: fix memory leak on kobject creation failure
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit 5ae416c5b1e2e816aee7b3fc8347adf70afabb4c upstream.
During wacom_initialize_remotes() a fifo buffer is allocated with kfifo_alloc() and later a cleanup action is registered during devm_add_action_or_reset() to clean it up.
However if the code fails to create a kobject and register it with sysfs the code simply returns -ENOMEM before the cleanup action is registered leading to a memory leak.
Fix this by ensuring the fifo is freed when the kobject creation and registration process fails.
--- drivers/hid/wacom_sys.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hid/wacom_sys.c +3 -1
@@ -2020,8 +2020,10 @@ static int wacom_initialize_remotes(stru remote->remote_dir =kobject_create_and_add ("wacom_remote" , &wacom->hdev->dev.kobj); -if (!remote->remote_dir) +if (!remote->remote_dir) { +kfifo_free (&remote->remote_fifo);return -ENOMEM ; + } error =sysfs_create_files (remote->remote_dir, remote_unpair_attrs);
Greg Kroah-Hartman
maintainerPATCH 47/148 HID: wacom: fix memory leak on sysfs attribute creation failure
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit 1a19ae437ca5d5c7d9ec2678946fb339b1c706bf upstream.
When sysfs_create_files() fails during wacom_initialize_remotes() the fifo buffer is not freed leading to a memory leak.
Fix this by calling kfifo_free() before returning.
--- drivers/hid/wacom_sys.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/wacom_sys.c +1 -0
@@ -2030,6 +2030,7 @@ static int wacom_initialize_remotes(struif (error) {hid_err (wacom->hdev,"cannot create sysfs group err: %d\n" , error); +kfifo_free (&remote->remote_fifo);return error; }
Greg Kroah-Hartman
maintainerPATCH 48/148 HID: wacom: fix kobject reference count leak
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit 85a720f4337f0ddf1603c8b75a8f1ffbbe022ef9 upstream.
When sysfs_create_files() fails in wacom_initialize_remotes() the error is returned and the cleanup action will not have been registered yet.
As a result the kobject???s refcount is never dropped, so the kobject can never be freed leading to a reference leak.
Fix this by calling kobject_put() before returning.
--- drivers/hid/wacom_sys.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/wacom_sys.c +1 -0
@@ -2031,6 +2031,7 @@ static int wacom_initialize_remotes(struhid_err (wacom->hdev,"cannot create sysfs group err: %d\n" , error);kfifo_free (&remote->remote_fifo); +kobject_put (remote->remote_dir);return error; }
Greg Kroah-Hartman
maintainerPATCH 49/148 drm/tegra: Assign plane type before registration
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thierry Reding <[email protected]>
commit 9ff4fdf4f44b69237c0afc1d3a8dac916ce66f3e upstream.
Changes to a plane's type after it has been registered aren't propagated to userspace automatically. This could possibly be achieved by updating the property, but since we can already determine which type this should be before the registration, passing in the right type from the start is a much better solution.
--- drivers/gpu/drm/tegra/dc.c | 12 ++++++++---- drivers/gpu/drm/tegra/hub.c | 4 ++-- drivers/gpu/drm/tegra/hub.h | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/gpu/drm/tegra/dc.c +8 -4
@@ -1103,10 +1103,16 @@ static struct drm_plane *tegra_dc_add_shif (wgrp->dc == dc->pipe) {for (j =0 ; j < wgrp->num_windows; j++) {unsigned int index = wgrp->windows[j]; +enum drm_plane_type type; + +if (primary) + type =DRM_PLANE_TYPE_OVERLAY ; +else + type =DRM_PLANE_TYPE_PRIMARY ; plane =tegra_shared_plane_create (drm, dc, wgrp->index, - index); + index, type);if (IS_ERR (plane))return plane;
@@ -1114,10 +1120,8 @@ static struct drm_plane *tegra_dc_add_sh* Choose the first shared plane owned by this * head as the primary plane. */ -if (!primary) { - plane->type =DRM_PLANE_TYPE_PRIMARY ; +if (!primary) primary = plane; - } } } }
drivers/gpu/drm/tegra/hub.c +2 -2
@@ -533,9 +533,9 @@ static const struct drm_plane_helper_funstruct drm_plane *tegra_shared_plane_create (struct drm_device *drm,struct tegra_dc *dc,unsigned int wgrp, -unsigned int index) +unsigned int index, +enum drm_plane_type type) { -enum drm_plane_type type =DRM_PLANE_TYPE_OVERLAY ;struct tegra_drm *tegra = drm->dev_private;struct tegra_display_hub *hub = tegra->hub;/* planes can be assigned to arbitrary CRTCs */
drivers/gpu/drm/tegra/hub.h +2 -1
@@ -81,7 +81,8 @@ void tegra_display_hub_cleanup(struct testruct drm_plane *tegra_shared_plane_create (struct drm_device *drm,struct tegra_dc *dc,unsigned int wgrp, -unsigned int index); +unsigned int index, +enum drm_plane_type type);int tegra_display_hub_atomic_check (struct drm_device *drm,struct drm_atomic_state *state);
Greg Kroah-Hartman
maintainerPATCH 50/148 drm/bridge: cdns-dsi: Fix the clock variable for mode_valid()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
commit 132bdcec399be6ae947582249a134b38cf56731c upstream.
The crtc_* mode parameters do not get generated (duplicated in this case) from the regular parameters before the mode validation phase begins.
The rest of the code conditionally uses the crtc_* parameters only during the bridge enable phase, but sticks to the regular parameters for mode validation. In this singular instance, however, the driver tries to use the crtc_clock parameter even during the mode validation, causing the validation to fail.
Allow the D-Phy config checks to use mode->clock instead of mode->crtc_clock during mode_valid checks, like everywhere else in the driver.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/cdns-dsi.c +2 -1
@@ -609,13 +609,14 @@ static int cdns_dsi_check_conf(struct cdstruct phy_configure_opts_mipi_dphy *phy_cfg = &output->phy_opts.mipi_dphy;unsigned long dsi_hss_hsa_hse_hbp;unsigned int nlanes = output->dev->lanes; +int mode_clock = (mode_valid_check ? mode->clock : mode->crtc_clock);int ret; ret =cdns_dsi_mode2cfg (dsi, mode, dsi_cfg, mode_valid_check);if (ret)return ret; -phy_mipi_dphy_get_default_config (mode->crtc_clock *1000 , +phy_mipi_dphy_get_default_config (mode_clock *1000 ,mipi_dsi_pixel_format_to_bpp (output->dev->format), nlanes, phy_cfg);
Greg Kroah-Hartman
maintainerPATCH 51/148 drm/bridge: cdns-dsi: Fix connecting to next bridge
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
commit 688eb4d465484bc2a3471a6a6f06f833b58c7867 upstream.
Fix the OF node pointer passed to the of_drm_find_bridge() call to find the next bridge in the display chain.
The code to find the next panel (and create its panel-bridge) works fine, but to find the next (non-panel) bridge does not.
To find the next bridge in the pipeline, we need to pass "np" - the OF node pointer of the next entity in the devicetree chain. Passing "of_node" to of_drm_find_bridge (which is what the code does currently) will fetch the bridge for the cdns-dsi which is not what's required.
Fix that.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/cdns-dsi.c +1 -1
@@ -959,7 +959,7 @@ static int cdns_dsi_attach(struct mipi_dif (!IS_ERR (panel)) { bridge =drm_panel_bridge_add (panel,DRM_MODE_CONNECTOR_DSI ); }else { - bridge =of_drm_find_bridge (dev->dev.of_node); + bridge =of_drm_find_bridge (np);if (!bridge) bridge =ERR_PTR (-EINVAL ); }
Greg Kroah-Hartman
maintainerPATCH 34/148 RDMA/iwcm: Fix use-after-free of work objects after cm_id destruction
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shin'ichiro Kawasaki <[email protected]>
[ Upstream commit 6883b680e703c6b2efddb4e7a8d891ce1803d06b ]
The commit 59c68ac31e15 ("iw_cm: free cm_id resources on the last deref") simplified cm_id resource management by freeing cm_id once all references to the cm_id were removed. The references are removed either upon completion of iw_cm event handlers or when the application destroys the cm_id. This commit introduced the use-after-free condition where cm_id_private object could still be in use by event handler works during the destruction of cm_id. The commit aee2424246f9 ("RDMA/iwcm: Fix a use-after-free related to destroying CM IDs") addressed this use-after- free by flushing all pending works at the cm_id destruction.
However, still another use-after-free possibility remained. It happens with the work objects allocated for each cm_id_priv within alloc_work_entries() during cm_id creation, and subsequently freed in dealloc_work_entries() once all references to the cm_id are removed. If the cm_id's last reference is decremented in the event handler work, the work object for the work itself gets removed, and causes the use- after-free BUG below:
BUG: KASAN: slab-use-after-free in __pwq_activate_work+0x1ff/0x250 Read of size 8 at addr ffff88811f9cf800 by task kworker/u16:1/147091 CPU: 2 UID: 0 PID: 147091 Comm: kworker/u16:1 Not tainted 6.15.0-rc2+ #27 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-3.fc41 04/01/2014 Workqueue: 0x0 (iw_cm_wq) Call Trace: <TASK> dump_stack_lvl+0x6a/0x90 print_report+0x174/0x554 ? __virt_addr_valid+0x208/0x430 ? __pwq_activate_work+0x1ff/0x250 kasan_report+0xae/0x170 ? __pwq_activate_work+0x1ff/0x250 __pwq_activate_work+0x1ff/0x250 pwq_dec_nr_in_flight+0x8c5/0xfb0 process_one_work+0xc11/0x1460 ? __pfx_process_one_work+0x10/0x10 ? assign_work+0x16c/0x240 worker_thread+0x5ef/0xfd0 ? __pfx_worker_thread+0x10/0x10 kthread+0x3b0/0x770 ? __pfx_kthread+0x10/0x10 ? rcu_is_watching+0x11/0xb0 ? _raw_spin_unlock_irq+0x24/0x50 ? rcu_is_watching+0x11/0xb0 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x30/0x70 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1a/0x30 </TASK> Allocated by task 147416: kasan_save_stack+0x2c/0x50 kasan_save_track+0x10/0x30 __kasan_kmalloc+0xa6/0xb0 alloc_work_entries+0xa9/0x260 [iw_cm] iw_cm_connect+0x23/0x4a0 [iw_cm] rdma_connect_locked+0xbfd/0x1920 [rdma_cm] nvme_rdma_cm_handler+0x8e5/0x1b60 [nvme_rdma] cma_cm_event_handler+0xae/0x320 [rdma_cm] cma_work_handler+0x106/0x1b0 [rdma_cm] process_one_work+0x84f/0x1460 worker_thread+0x5ef/0xfd0 kthread+0x3b0/0x770 ret_from_fork+0x30/0x70 ret_from_fork_asm+0x1a/0x30 Freed by task 147091: kasan_save_stack+0x2c/0x50 kasan_save_track+0x10/0x30 kasan_save_free_info+0x37/0x60 __kasan_slab_free+0x4b/0x70 kfree+0x13a/0x4b0 dealloc_work_entries+0x125/0x1f0 [iw_cm] iwcm_deref_id+0x6f/0xa0 [iw_cm] cm_work_handler+0x136/0x1ba0 [iw_cm] process_one_work+0x84f/0x1460 worker_thread+0x5ef/0xfd0 kthread+0x3b0/0x770 ret_from_fork+0x30/0x70 ret_from_fork_asm+0x1a/0x30 Last potentially related work creation: kasan_save_stack+0x2c/0x50 kasan_record_aux_stack+0xa3/0xb0 __queue_work+0x2ff/0x1390 queue_work_on+0x67/0xc0 cm_event_handler+0x46a/0x820 [iw_cm] siw_cm_upcall+0x330/0x650 [siw] siw_cm_work_handler+0x6b9/0x2b20 [siw] process_one_work+0x84f/0x1460 worker_thread+0x5ef/0xfd0 kthread+0x3b0/0x770 ret_from_fork+0x30/0x70 ret_from_fork_asm+0x1a/0x30
This BUG is reproducible by repeating the blktests test case nvme/061 for the rdma transport and the siw driver.
To avoid the use-after-free of cm_id_private work objects, ensure that the last reference to the cm_id is decremented not in the event handler works, but in the cm_id destruction context. For that purpose, move iwcm_deref_id() call from destroy_cm_id() to the callers of destroy_cm_id(). In iw_destroy_cm_id(), call iwcm_deref_id() after flushing the pending works.
During the fix work, I noticed that iw_destroy_cm_id() is called from cm_work_handler() and process_event() context. However, the comment of iw_destroy_cm_id() notes that the function "cannot be called by the event thread". Drop the false comment.
--- drivers/infiniband/core/iwcm.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
drivers/infiniband/core/iwcm.c +15 -14
@@ -367,12 +367,9 @@ EXPORT_SYMBOL(iw_cm_disconnect);/* * CM_ID <-- DESTROYING * -* Clean up all resources associated with the connection and release -* the initial reference taken by iw_create_cm_id. -* -* Returns true if and only if the last cm_id_priv reference has been dropped. +* Clean up all resources associated with the connection. */ -static bool destroy_cm_id (struct iw_cm_id *cm_id) +static void destroy_cm_id (struct iw_cm_id *cm_id) {struct iwcm_id_private *cm_id_priv;struct ib_qp *qp;
@@ -441,20 +438,22 @@ static bool destroy_cm_id(struct iw_cm_id *cm_id)iwpm_remove_mapinfo (&cm_id->local_addr, &cm_id->m_local_addr);iwpm_remove_mapping (&cm_id->local_addr,RDMA_NL_IWCM ); } - -return iwcm_deref_id (cm_id_priv); }/* -* This function is only called by the application thread and cannot -* be called by the event thread. The function will wait for all -* references to be released on the cm_id and then kfree the cm_id -* object. +* Destroy cm_id. If the cm_id still has other references, wait for all +* references to be released on the cm_id and then release the initial +* reference taken by iw_create_cm_id. */ void iw_destroy_cm_id (struct iw_cm_id *cm_id) { -if (!destroy_cm_id (cm_id)) +struct iwcm_id_private *cm_id_priv; + + cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); +destroy_cm_id (cm_id); +if (refcount_read (&cm_id_priv->refcount) >1 )flush_workqueue (iwcm_wq); +iwcm_deref_id (cm_id_priv); }EXPORT_SYMBOL (iw_destroy_cm_id);
@@ -1037,8 +1036,10 @@ static void cm_work_handler(struct work_struct *_work)if (!test_bit (IWCM_F_DROP_EVENTS , &cm_id_priv->flags)) { ret =process_event (cm_id_priv, &levent); -if (ret) -WARN_ON_ONCE (destroy_cm_id (&cm_id_priv->id)); +if (ret) { +destroy_cm_id (&cm_id_priv->id); +WARN_ON_ONCE (iwcm_deref_id (cm_id_priv)); + } }else pr_debug ("dropping event %d\n" , levent.event);if (iwcm_deref_id (cm_id_priv))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 52/148 drm/bridge: cdns-dsi: Check return value when getting default PHY config
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
commit c6a7ef0d4856b9629df390e9935d7fd67fe39f81 upstream.
Check for the return value of the phy_mipi_dphy_get_default_config() call, and in case of an error, return back the same.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/cdns-dsi.c +5 -3
@@ -616,9 +616,11 @@ static int cdns_dsi_check_conf(struct cdif (ret)return ret; -phy_mipi_dphy_get_default_config (mode_clock *1000 , -mipi_dsi_pixel_format_to_bpp (output->dev->format), - nlanes, phy_cfg); + ret =phy_mipi_dphy_get_default_config (mode_clock *1000 , +mipi_dsi_pixel_format_to_bpp (output->dev->format), + nlanes, phy_cfg); +if (ret) +return ret; ret =cdns_dsi_adjust_phy_config (dsi, dsi_cfg, phy_cfg, mode, mode_valid_check);if (ret)
Greg Kroah-Hartman
maintainerPATCH 53/148 s390: Add -std=gnu11 to decompressor and purgatory CFLAGS
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 3b8b80e993766dc96d1a1c01c62f5d15fafc79b9 upstream.
GCC changed the default C standard dialect from gnu17 to gnu23, which should not have impacted the kernel because it explicitly requests the gnu11 standard in the main Makefile. However, there are certain places in the s390 code that use their own CFLAGS without a '-std=' value, which break with this dialect change because of the kernel's own definitions of bool, false, and true conflicting with the C23 reserved keywords.
include/linux/stddef.h:11:9: error: cannot use keyword 'false' as enumeration constant
11 | false = 0,
| ^~~~~
include/linux/stddef.h:11:9: note: 'false' is a keyword with '-std=c23' onwards
include/linux/types.h:35:33: error: 'bool' cannot be defined via 'typedef'
35 | typedef _Bool bool;
| ^~~~ include/linux/types.h:35:33: note: 'bool' is a keyword with '-std=c23' onwards
Add '-std=gnu11' to the decompressor and purgatory CFLAGS to eliminate these errors and make the C standard version of these areas match the rest of the kernel.
--- arch/s390/Makefile | 2 +- arch/s390/purgatory/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/Makefile +1 -1
@@ -23,7 +23,7 @@ endif aflags_dwarf := -Wa,-gdwarf-2 KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__ KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf)) -KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 +KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 -std=gnu11 KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
arch/s390/purgatory/Makefile +1 -1
@@ -20,7 +20,7 @@ GCOV_PROFILE := n UBSAN_SANITIZE := n KASAN_SANITIZE := n -KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes +KBUILD_CFLAGS := -std=gnu11 -fno-strict-aliasing -Wall -Wstrict-prototypes KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common
Greg Kroah-Hartman
maintainerPATCH 54/148 arm64: Restrict pagetable teardown to avoid false warning
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dev Jain <[email protected]>
commit 650768c512faba8070bf4cfbb28c95eb5cd203f3 upstream.
Commit 9c006972c3fe ("arm64: mmu: drop pXd_present() checks from pXd_free_pYd_table()") removes the pxd_present() checks because the caller checks pxd_present(). But, in case of vmap_try_huge_pud(), the caller only checks pud_present(); pud_free_pmd_page() recurses on each pmd through pmd_free_pte_page(), wherein the pmd may be none. Thus it is possible to hit a warning in the latter, since pmd_none => !pmd_table(). Thus, add a pmd_present() check in pud_free_pmd_page().
This problem was found by code inspection.
--- arch/arm64/mm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/mm/mmu.c +2 -1
@@ -1041,7 +1041,8 @@ int pud_free_pmd_page(pud_t *pudp, unsig next = addr; end = addr +PUD_SIZE ;do { -pmd_free_pte_page (pmdp, next); +if (pmd_present (READ_ONCE (*pmdp))) +pmd_free_pte_page (pmdp, next); }while (pmdp++, next +=PMD_SIZE , next != end);pud_clear (pudp);
Greg Kroah-Hartman
maintainerPATCH 55/148 btrfs: dont abort filesystem when attempting to snapshot deleted subvolume
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Omar Sandoval <[email protected]>
commit 7081929ab2572920e94d70be3d332e5c9f97095a upstream.
If the source file descriptor to the snapshot ioctl refers to a deleted subvolume, we get the following abort:
BTRFS: Transaction aborted (error -2)
WARNING: CPU: 0 PID: 833 at fs/btrfs/transaction.c:1875 create_pending_snapshot+0x1040/0x1190 [btrfs] Modules linked in: pata_acpi btrfs ata_piix libata scsi_mod virtio_net blake2b_generic xor net_failover virtio_rng failover scsi_common rng_core raid6_pq libcrc32c CPU: 0 PID: 833 Comm: t_snapshot_dele Not tainted 6.7.0-rc6 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-1.fc39 04/01/2014 RIP: 0010:create_pending_snapshot+0x1040/0x1190 [btrfs] RSP: 0018:ffffa09c01337af8 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff9982053e7c78 RCX: 0000000000000027 RDX: ffff99827dc20848 RSI: 0000000000000001 RDI: ffff99827dc20840 RBP: ffffa09c01337c00 R08: 0000000000000000 R09: ffffa09c01337998 R10: 0000000000000003 R11: ffffffffb96da248 R12: fffffffffffffffe R13: ffff99820535bb28 R14: ffff99820b7bd000 R15: ffff99820381ea80 FS: 00007fe20aadabc0(0000) GS:ffff99827dc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000559a120b502f CR3: 00000000055b6000 CR4: 00000000000006f0 Call Trace: <TASK> ? create_pending_snapshot+0x1040/0x1190 [btrfs] ? __warn+0x81/0x130 ? create_pending_snapshot+0x1040/0x1190 [btrfs] ? report_bug+0x171/0x1a0 ? handle_bug+0x3a/0x70 ? exc_invalid_op+0x17/0x70 ? asm_exc_invalid_op+0x1a/0x20 ? create_pending_snapshot+0x1040/0x1190 [btrfs] ? create_pending_snapshot+0x1040/0x1190 [btrfs] create_pending_snapshots+0x92/0xc0 [btrfs] btrfs_commit_transaction+0x66b/0xf40 [btrfs] btrfs_mksubvol+0x301/0x4d0 [btrfs] btrfs_mksnapshot+0x80/0xb0 [btrfs] __btrfs_ioctl_snap_create+0x1c2/0x1d0 [btrfs] btrfs_ioctl_snap_create_v2+0xc4/0x150 [btrfs] btrfs_ioctl+0x8a6/0x2650 [btrfs] ? kmem_cache_free+0x22/0x340 ? do_sys_openat2+0x97/0xe0 __x64_sys_ioctl+0x97/0xd0 do_syscall_64+0x46/0xf0 entry_SYSCALL_64_after_hwframe+0x6e/0x76 RIP: 0033:0x7fe20abe83af RSP: 002b:00007ffe6eff1360 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 00007fe20abe83af RDX: 00007ffe6eff23c0 RSI: 0000000050009417 RDI: 0000000000000003 RBP: 0000000000000003 R08: 0000000000000000 R09: 00007fe20ad16cd0 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffe6eff13c0 R14: 00007fe20ad45000 R15: 0000559a120b6d58 </TASK> ---[ end trace 0000000000000000 ]--- BTRFS: error (device vdc: state A) in create_pending_snapshot:1875: errno=-2 No such entry BTRFS info (device vdc: state EA): forced readonly BTRFS warning (device vdc: state EA): Skipping commit of aborted transaction. BTRFS: error (device vdc: state EA) in cleanup_transaction:2055: errno=-2 No such entry
This happens because create_pending_snapshot() initializes the new root item as a copy of the source root item. This includes the refs field, which is 0 for a deleted subvolume. The call to btrfs_insert_root() therefore inserts a root with refs == 0. btrfs_get_new_fs_root() then finds the root and returns -ENOENT if refs == 0, which causes create_pending_snapshot() to abort.
Fix it by checking the source root's refs before attempting the snapshot, but after locking subvol_sem to avoid racing with deletion.
[ Larry: backport to 5.4.y. Minor conflict resolved due to missing commit 92a7cc425223
btrfs: rename BTRFS_ROOT_REF_COWS to BTRFS_ROOT_SHAREABLE ]
--- fs/btrfs/ioctl.c | 3 +++ 1 file changed, 3 insertions(+)
fs/btrfs/ioctl.c +3 -0
@@ -793,6 +793,9 @@ static int create_snapshot(struct btrfs_if (!test_bit (BTRFS_ROOT_REF_COWS , &root->state))return -EINVAL ; +if (btrfs_root_refs (&root->root_item) ==0 ) +return -ENOENT ; +if (atomic_read (&root->nr_swapfiles)) {btrfs_warn (fs_info,"cannot snapshot subvolume with active swapfile" );
Greg Kroah-Hartman
maintainerPATCH 56/148 vsock/vmci: Clear the vmci transport packet properly when initializing it
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: HarshaVardhana S A <[email protected]>
commit 223e2288f4b8c262a864e2c03964ffac91744cd5 upstream.
In vmci_transport_packet_init memset the vmci_transport_packet before populating the fields to avoid any uninitialised data being left in the structure.
--- net/vmw_vsock/vmci_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/vmw_vsock/vmci_transport.c +2 -2
@@ -125,6 +125,8 @@ vmci_transport_packet_init(struct vmci_tu16 proto, struct vmci_handle handle) { + memset(pkt, 0, sizeof(*pkt)); +/* We register the stream control handler as an any cid handle so we * must always send from a source address of VMADDR_CID_ANY */
@@ -137,8 +139,6 @@ vmci_transport_packet_init(struct vmci_t pkt->type = type; pkt->src_port = src->svm_port; pkt->dst_port = dst->svm_port; -memset (&pkt->proto,0 ,sizeof (pkt->proto)); -memset (&pkt->_reserved2,0 ,sizeof (pkt->_reserved2));switch (pkt->type) {case VMCI_TRANSPORT_PACKET_TYPE_INVALID :
Greg Kroah-Hartman
maintainerPATCH 57/148 mmc: sdhci: Add a helper function for dump register in dynamic debug mode
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Shih <[email protected]>
commit 2881ba9af073faa8ee7408a8d1e0575e50eb3f6c upstream.
Add a helper function for dump register in dynamic debug mode.
--- drivers/mmc/host/sdhci.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/mmc/host/sdhci.h +16 -0
@@ -801,4 +801,20 @@ void sdhci_abort_tuning(struct sdhci_hosvoid sdhci_set_data_timeout_irq (struct sdhci_host *host,bool enable);void __sdhci_set_timeout (struct sdhci_host *host,struct mmc_command *cmd); +#if defined(CONFIG_DYNAMIC_DEBUG ) || \ + (defined(CONFIG_DYNAMIC_DEBUG_CORE ) && defined(DYNAMIC_DEBUG_MODULE )) +#define SDHCI_DBG_ANYWAY 0 +#elif defined(DEBUG ) +#define SDHCI_DBG_ANYWAY 1 +#else +#define SDHCI_DBG_ANYWAY 0 +#endif + +#define sdhci_dbg_dumpregs (host, fmt) \ +do { \ + DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ + if (DYNAMIC_DEBUG_BRANCH(descriptor) || SDHCI_DBG_ANYWAY) \ + sdhci_dumpregs(host); \ +} while (0) +#endif /* __SDHCI_HW_H */
Greg Kroah-Hartman
maintainerPATCH 58/148 Revert "mmc: sdhci: Disable SD card clock before changing parameters"
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ulf Hansson <[email protected]>
commit dcc3bcfc5b50c625b475dcc25d167b6b947a6637 upstream.
It has turned out the trying to strictly conform to the SDHCI specification is causing problems. Let's revert and start over.
This reverts commit fb3bbc46c94f261b6156ee863c1b06c84cf157dc.
--- drivers/mmc/host/sdhci.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/mmc/host/sdhci.c +2 -7
@@ -1708,15 +1708,10 @@ void sdhci_set_clock(struct sdhci_host * host->mmc->actual_clock =0 ; - clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); -if (clk &SDHCI_CLOCK_CARD_EN ) -sdhci_writew (host, clk & ~SDHCI_CLOCK_CARD_EN , -SDHCI_CLOCK_CONTROL ); +sdhci_writew (host,0 ,SDHCI_CLOCK_CONTROL ); -if (clock ==0 ) { -sdhci_writew (host,0 ,SDHCI_CLOCK_CONTROL ); +if (clock ==0 )return ; - } clk =sdhci_calc_clk (host, clock, &host->mmc->actual_clock);sdhci_enable_clk (host, clk);
Greg Kroah-Hartman
maintainerPATCH 59/148 usb: typec: altmodes/displayport: do not index invalid pin_assignments
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit af4db5a35a4ef7a68046883bfd12468007db38f1 upstream.
A poorly implemented DisplayPort Alt Mode port partner can indicate that its pin assignment capabilities are greater than the maximum value, DP_PIN_ASSIGN_F. In this case, calls to pin_assignment_show will cause a BRK exception due to an out of bounds array access.
Prevent for loop in pin_assignment_show from accessing invalid values in pin_assignments by adding DP_PIN_ASSIGN_MAX value in typec_dp.h and using i < DP_PIN_ASSIGN_MAX as a loop condition.
--- drivers/usb/typec/altmodes/displayport.c | 2 +- include/linux/usb/typec_dp.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/usb/typec/altmodes/displayport.c +1 -1
@@ -492,7 +492,7 @@ static ssize_t pin_assignment_show(struc assignments =get_current_pin_assignments (dp); -for (i =0 ; assignments; assignments >>=1 , i++) { +for (i =0 ; assignments && i <DP_PIN_ASSIGN_MAX ; assignments >>=1 , i++) {if (assignments &1 ) {if (i == cur) len += sprintf(buf + len, "[%s] ",
include/linux/usb/typec_dp.h +1 -0
@@ -56,6 +56,7 @@ enum {DP_PIN_ASSIGN_D ,DP_PIN_ASSIGN_E ,DP_PIN_ASSIGN_F ,/* Not supported after v1.0b */ + DP_PIN_ASSIGN_MAX, };/* DisplayPort alt mode specific commands */
Greg Kroah-Hartman
maintainerPATCH 60/148 mtk-sd: Fix a pagefault in dma_unmap_sg() for not prepared data
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
commit 539d80575b810c7a5987c7ac8915e3bc99c03695 upstream.
When swiotlb buffer is full, the dma_map_sg() returns 0 to msdc_prepare_data(), but it does not check it and sets the MSDC_PREPARE_FLAG.
swiotlb_tbl_map_single() /* prints "swiotlb buffer is full" */
<-swiotlb_map()
<-dma_direct_map_page()
<-dma_direct_map_sg()
<-__dma_map_sg_attrs()
<-dma_map_sg_attrs()
<-dma_map_sg() /* returns 0 (pages mapped) */
<-msdc_prepare_data()Then, the msdc_unprepare_data() checks MSDC_PREPARE_FLAG and calls dma_unmap_sg() with unmapped pages. It causes a page fault.
To fix this problem, Do not set MSDC_PREPARE_FLAG if dma_map_sg() fails because this is not prepared.
--- drivers/mmc/host/mtk-sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/mtk-sd.c +2 -1
@@ -681,9 +681,10 @@ static void msdc_prepare_data(struct msdstruct mmc_data *data = mrq->data;if (!(data->host_cookie &MSDC_PREPARE_FLAG )) { - data->host_cookie |=MSDC_PREPARE_FLAG ; data->sg_count =dma_map_sg (host->dev, data->sg, data->sg_len,mmc_get_dma_dir (data)); +if (data->sg_count) + data->host_cookie |=MSDC_PREPARE_FLAG ; } }
Greg Kroah-Hartman
maintainerPATCH 61/148 platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignment
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Thompson <[email protected]>
[ Upstream commit 109f4d29dade8ae5b4ac6325af9d1bc24b4230f8 ]
Fix warnings reported by sparse, related to incorrect type:drivers/platform/mellanox/mlxbf-tmfifo.c:284:38: warning: incorrect type in assignment (different base types)drivers/platform/mellanox/mlxbf-tmfifo.c:284:38: expected restricted __virtio32 [usertype] lendrivers/platform/mellanox/mlxbf-tmfifo.c:284:38: got unsigned long
--- drivers/platform/mellanox/mlxbf-tmfifo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/platform/mellanox/mlxbf-tmfifo.c +2 -1
@@ -253,7 +253,8 @@ static int mlxbf_tmfifo_alloc_vrings(struct mlxbf_tmfifo *fifo, vring->align =SMP_CACHE_BYTES ; vring->index = i; vring->vdev_id = tm_vdev->vdev.id.device; - vring->drop_desc.len =VRING_DROP_DESC_MAX_LEN ; + vring->drop_desc.len =cpu_to_virtio32 (&tm_vdev->vdev, +VRING_DROP_DESC_MAX_LEN ); dev = &tm_vdev->vdev.dev; size =vring_size (vring->num, vring->align);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 35/148 i2c: tiny-usb: disable zero-length read messages
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
commit cbdb25ccf7566eee0c2b945e35cb98baf9ed0aa6 upstream.
This driver passes the length of an i2c_msg directly to usb_control_msg(). If the message is now a read and of length 0, it violates the USB protocol and a warning will be printed. Enable the I2C_AQ_NO_ZERO_LEN_READ quirk for this adapter thus forbidding 0-length read messages altogether.
--- drivers/i2c/busses/i2c-tiny-usb.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/i2c/busses/i2c-tiny-usb.c +6 -0
@@ -140,6 +140,11 @@ out:return ret; } +/* prevent invalid 0-length usb_control_msg */ +static const struct i2c_adapter_quirks usb_quirks = { + .flags =I2C_AQ_NO_ZERO_LEN_READ , +}; +/* This is the actual algorithm we define */ static const struct i2c_algorithm usb_algorithm = { .master_xfer = usb_xfer,
@@ -246,6 +251,7 @@ static int i2c_tiny_usb_probe(struct usb/* setup i2c adapter description */ dev->adapter.owner =THIS_MODULE ; dev->adapter.class =I2C_CLASS_HWMON ; + dev->adapter.quirks = &usb_quirks; dev->adapter.algo = &usb_algorithm; dev->adapter.algo_data = dev; snprintf(dev->adapter.name, sizeof(dev->adapter.name),
Greg Kroah-Hartman
maintainerPATCH 62/148 RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insert
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Zhang <[email protected]>
[ Upstream commit 8edab8a72d67742f87e9dc2e2b0cdfddda5dc29a ]
The obj_event may be loaded immediately after inserted, then if the list_head is not initialized then we may get a poisonous pointer. This fixes the crash below:
mlx5_core 0000:03:00.0: MLX5E: StrdRq(1) RqSz(8) StrdSz(2048) RxCqeCmprss(0 enhanced) mlx5_core.sf mlx5_core.sf.4: firmware version: 32.38.3056
mlx5_core 0000:03:00.0 en3f0pf0sf2002: renamed from eth0
mlx5_core.sf mlx5_core.sf.4: Rate limit: 127 rates are supported, range: 0Mbps to 195312Mbps
IPv6: ADDRCONF(NETDEV_CHANGE): en3f0pf0sf2002: link becomes ready
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000060 Mem abort info: ESR = 0x96000006 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 Data abort info: ISV = 0, ISS = 0x00000006 CM = 0, WnR = 0 user pgtable: 4k pages, 48-bit VAs, pgdp=00000007760fb000 [0000000000000060] pgd=000000076f6d7003, p4d=000000076f6d7003, pud=0000000777841003, pmd=0000000000000000 Internal error: Oops: 96000006 [#1] SMP Modules linked in: ipmb_host(OE) act_mirred(E) cls_flower(E) sch_ingress(E) mptcp_diag(E) udp_diag(E) raw_diag(E) unix_diag(E) tcp_diag(E) inet_diag(E) binfmt_misc(E) bonding(OE) rdma_ucm(OE) rdma_cm(OE) iw_cm(OE) ib_ipoib(OE) ib_cm(OE) isofs(E) cdrom(E) mst_pciconf(OE) ib_umad(OE) mlx5_ib(OE) ipmb_dev_int(OE) mlx5_core(OE) kpatch_15237886(OEK) mlxdevm(OE) auxiliary(OE) ib_uverbs(OE) ib_core(OE) psample(E) mlxfw(OE) tls(E) sunrpc(E) vfat(E) fat(E) crct10dif_ce(E) ghash_ce(E) sha1_ce(E) sbsa_gwdt(E) virtio_console(E) ext4(E) mbcache(E) jbd2(E) xfs(E) libcrc32c(E) mmc_block(E) virtio_net(E) net_failover(E) failover(E) sha2_ce(E) sha256_arm64(E) nvme(OE) nvme_core(OE) gpio_mlxbf3(OE) mlx_compat(OE) mlxbf_pmc(OE) i2c_mlxbf(OE) sdhci_of_dwcmshc(OE) pinctrl_mlxbf3(OE) mlxbf_pka(OE) gpio_generic(E) i2c_core(E) mmc_core(E) mlxbf_gige(OE) vitesse(E) pwr_mlxbf(OE) mlxbf_tmfifo(OE) micrel(E) mlxbf_bootctl(OE) virtio_ring(E) virtio(E) ipmi_devintf(E) ipmi_msghandler(E) [last unloaded: mst_pci] CPU: 11 PID: 20913 Comm: rte-worker-11 Kdump: loaded Tainted: G OE K 5.10.134-13.1.an8.aarch64 #1 Hardware name: https://www.mellanox.com BlueField-3 SmartNIC Main Card/BlueField-3 SmartNIC Main Card, BIOS 4.2.2.12968 Oct 26 2023 pstate: a0400089 (NzCv daIf +PAN -UAO -TCO BTYPE=--) pc : dispatch_event_fd+0x68/0x300 [mlx5_ib] lr : devx_event_notifier+0xcc/0x228 [mlx5_ib] sp : ffff80001005bcf0 x29: ffff80001005bcf0 x28: 0000000000000001 x27: ffff244e0740a1d8 x26: ffff244e0740a1d0 x25: ffffda56beff5ae0 x24: ffffda56bf911618 x23: ffff244e0596a480 x22: ffff244e0596a480 x21: ffff244d8312ad90 x20: ffff244e0596a480 x19: fffffffffffffff0 x18: 0000000000000000 x17: 0000000000000000 x16: ffffda56be66d620 x15: 0000000000000000 x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000040 x10: ffffda56bfcafb50 x9 : ffffda5655c25f2c x8 : 0000000000000010 x7 : 0000000000000000 x6 : ffff24545a2e24b8 x5 : 0000000000000003 x4 : ffff80001005bd28 x3 : 0000000000000000 x2 : 0000000000000000 x1 : ffff244e0596a480 x0 : ffff244d8312ad90 Call trace: dispatch_event_fd+0x68/0x300 [mlx5_ib] devx_event_notifier+0xcc/0x228 [mlx5_ib] atomic_notifier_call_chain+0x58/0x80 mlx5_eq_async_int+0x148/0x2b0 [mlx5_core] atomic_notifier_call_chain+0x58/0x80 irq_int_handler+0x20/0x30 [mlx5_core] __handle_irq_event_percpu+0x60/0x220 handle_irq_event_percpu+0x3c/0x90 handle_irq_event+0x58/0x158 handle_fasteoi_irq+0xfc/0x188 generic_handle_irq+0x34/0x48 ...
--- drivers/infiniband/hw/mlx5/devx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/devx.c +1 -1
@@ -1840,6 +1840,7 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table,/* Level1 is valid for future use, no need to free */ return -ENOMEM ; +INIT_LIST_HEAD (&obj_event->obj_sub_list); err = xa_insert(&event->object_ids, key_level2, obj_event,
@@ -1848,7 +1849,6 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table,kfree (obj_event);return err; } -INIT_LIST_HEAD (&obj_event->obj_sub_list); }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 63/148 nfs: Clean up /proc/net/rpc/nfs when nfs_fs_proc_net_init() fails.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit e8d6f3ab59468e230f3253efe5cb63efa35289f7 ]
syzbot reported a warning below [1] following a fault injection in nfs_fs_proc_net_init(). [0]
When nfs_fs_proc_net_init() fails, /proc/net/rpc/nfs is not removed.
Later, rpc_proc_exit() tries to remove /proc/net/rpc, and the warning is logged as the directory is not empty.
Let's handle the error of nfs_fs_proc_net_init() properly.
[0]:FAULT_INJECTION: forcing a failure.
name failslab, interval 1, probability 0, space 0, times 0
CPU: 1 UID: 0 PID: 6120 Comm: syz.2.27 Not tainted 6.16.0-rc1-syzkaller-00010-g2c4a1f3fe03e #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 Call Trace: <TASK> dump_stack_lvl (lib/dump_stack.c:123) should_fail_ex (lib/fault-inject.c:73 lib/fault-inject.c:174) should_failslab (mm/failslab.c:46) kmem_cache_alloc_noprof (mm/slub.c:4178 mm/slub.c:4204) __proc_create (fs/proc/generic.c:427) proc_create_reg (fs/proc/generic.c:554) proc_create_net_data (fs/proc/proc_net.c:120) nfs_fs_proc_net_init (fs/nfs/client.c:1409) nfs_net_init (fs/nfs/inode.c:2600) ops_init (net/core/net_namespace.c:138) setup_net (net/core/net_namespace.c:443) copy_net_ns (net/core/net_namespace.c:576) create_new_namespaces (kernel/nsproxy.c:110) unshare_nsproxy_namespaces (kernel/nsproxy.c:218 (discriminator 4)) ksys_unshare (kernel/fork.c:3123) __x64_sys_unshare (kernel/fork.c:3190) do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) </TASK>
[1]:remove_proc_entry: removing non-empty directory 'net/rpc', leaking at least 'nfs'
WARNING: CPU: 1 PID: 6120 at fs/proc/generic.c:727 remove_proc_entry+0x45e/0x530 fs/proc/generic.c:727 Modules linked in: CPU: 1 UID: 0 PID: 6120 Comm: syz.2.27 Not tainted 6.16.0-rc1-syzkaller-00010-g2c4a1f3fe03e #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 RIP: 0010:remove_proc_entry+0x45e/0x530 fs/proc/generic.c:727 Code: 3c 02 00 0f 85 85 00 00 00 48 8b 93 d8 00 00 00 4d 89 f0 4c 89 e9 48 c7 c6 40 ba a2 8b 48 c7 c7 60 b9 a2 8b e8 33 81 1d ff 90 <0f> 0b 90 90 e9 5f fe ff ff e8 04 69 5e ff 90 48 b8 00 00 00 00 00 RSP: 0018:ffffc90003637b08 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff88805f534140 RCX: ffffffff817a92c8 RDX: ffff88807da99e00 RSI: ffffffff817a92d5 RDI: 0000000000000001 RBP: ffff888033431ac0 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000001 R12: ffff888033431a00 R13: ffff888033431ae4 R14: ffff888033184724 R15: dffffc0000000000 FS: 0000555580328500(0000) GS:ffff888124a62000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f71733743e0 CR3: 000000007f618000 CR4: 00000000003526f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> sunrpc_exit_net+0x46/0x90 net/sunrpc/sunrpc_syms.c:76 ops_exit_list net/core/net_namespace.c:200 [inline] ops_undo_list+0x2eb/0xab0 net/core/net_namespace.c:253 setup_net+0x2e1/0x510 net/core/net_namespace.c:457 copy_net_ns+0x2a6/0x5f0 net/core/net_namespace.c:574 create_new_namespaces+0x3ea/0xa90 kernel/nsproxy.c:110 unshare_nsproxy_namespaces+0xc0/0x1f0 kernel/nsproxy.c:218 ksys_unshare+0x45b/0xa40 kernel/fork.c:3121 __do_sys_unshare kernel/fork.c:3192 [inline] __se_sys_unshare kernel/fork.c:3190 [inline] __x64_sys_unshare+0x31/0x40 kernel/fork.c:3190 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x490 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7fa1a6b8e929 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fff3a090368 EFLAGS: 00000246 ORIG_RAX: 0000000000000110 RAX: ffffffffffffffda RBX: 00007fa1a6db5fa0 RCX: 00007fa1a6b8e929 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000040000080 RBP: 00007fa1a6c10b39 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fa1a6db5fa0 R14: 00007fa1a6db5fa0 R15: 0000000000000001 </TASK>
--- fs/nfs/inode.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
fs/nfs/inode.c +14 -3
@@ -2180,15 +2180,26 @@ EXPORT_SYMBOL_GPL(nfs_net_id);static int nfs_net_init (struct net *net) {struct nfs_net *nn =net_generic (net, nfs_net_id); +int err;nfs_clients_init (net);if (!rpc_proc_register (net, &nn->rpcstats)) { -nfs_clients_exit (net); -return -ENOMEM ; + err = -ENOMEM ; + goto err_proc_rpc; } -return nfs_fs_proc_net_init (net); + err =nfs_fs_proc_net_init (net); +if (err) + goto err_proc_nfs; + +return 0 ; + +err_proc_nfs: +rpc_proc_unregister (net,"nfs" ); +err_proc_rpc: +nfs_clients_exit (net); +return err; }static void nfs_net_exit (struct net *net)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 64/148 scsi: qla4xxx: Fix missing DMA mapping error in qla4xxx_alloc_pdu()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 00f452a1b084efbe8dcb60a29860527944a002a1 ]
dma_map_XXX() can fail and should be tested for errors with dma_mapping_error().
--- drivers/scsi/qla4xxx/ql4_os.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla4xxx/ql4_os.c +2 -0
@@ -3394,6 +3394,8 @@ static int qla4xxx_alloc_pdu(struct iscsi_task *task, uint8_t opcode) task_data->data_dma =dma_map_single (&ha->pdev->dev, task->data, task->data_count,DMA_TO_DEVICE ); +if (dma_mapping_error (&ha->pdev->dev, task_data->data_dma)) +return -ENOMEM ; } DEBUG2(ql4_printk(KERN_INFO, ha, "%s: MaxRecvLen %u, iscsi hrd %d\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 65/148 btrfs: fix missing error handling when searching for inode refs during log replay
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 6561a40ceced9082f50c374a22d5966cf9fc5f5c ]
During log replay, at __add_inode_ref(), when we are searching for inode ref keys we totally ignore if btrfs_search_slot() returns an error. This may make a log replay succeed when there was an actual error and leave some metadata inconsistency in a subvolume tree. Fix this by checking if an error was returned from btrfs_search_slot() and if so, return it to the caller.
--- fs/btrfs/tree-log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/tree-log.c +3 -1
@@ -1033,7 +1033,9 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, search_key.type =BTRFS_INODE_REF_KEY ; search_key.offset = parent_objectid; ret =btrfs_search_slot (NULL , root, &search_key, path,0 ,0 ); -if (ret ==0 ) { +if (ret <0 ) { +return ret; + }else if (ret ==0 ) {struct btrfs_inode_ref *victim_ref;unsigned long ptr;unsigned long ptr_end;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 36/148 i2c: robotfuzz-osif: disable zero-length read messages
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
commit 56ad91c1aa9c18064348edf69308080b03c9dc48 upstream.
This driver passes the length of an i2c_msg directly to usb_control_msg(). If the message is now a read and of length 0, it violates the USB protocol and a warning will be printed. Enable the I2C_AQ_NO_ZERO_LEN_READ quirk for this adapter thus forbidding 0-length read messages altogether.
--- drivers/i2c/busses/i2c-robotfuzz-osif.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/i2c/busses/i2c-robotfuzz-osif.c +6 -0
@@ -111,6 +111,11 @@ static u32 osif_func(struct i2c_adapterreturn I2C_FUNC_I2C |I2C_FUNC_SMBUS_EMUL ; } +/* prevent invalid 0-length usb_control_msg */ +static const struct i2c_adapter_quirks osif_quirks = { + .flags =I2C_AQ_NO_ZERO_LEN_READ , +}; +static const struct i2c_algorithm osif_algorithm = { .master_xfer = osif_xfer, .functionality = osif_func,
@@ -143,6 +148,7 @@ static int osif_probe(struct usb_interfa priv->adapter.owner =THIS_MODULE ; priv->adapter.class =I2C_CLASS_HWMON ; + priv->adapter.quirks = &osif_quirks; priv->adapter.algo = &osif_algorithm; priv->adapter.algo_data = priv; snprintf(priv->adapter.name, sizeof(priv->adapter.name),
Greg Kroah-Hartman
maintainerPATCH 37/148 ALSA: usb-audio: Fix out-of-bounds read in snd_usb_get_audioformat_uac3()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Youngjun Lee <[email protected]>
[ Upstream commit fb4e2a6e8f28a3c0ad382e363aeb9cd822007b8a ]
In snd_usb_get_audioformat_uac3(), the length value returned from snd_usb_ctl_msg() is used directly for memory allocation without validation. This length is controlled by the USB device.
The allocated buffer is cast to a uac3_cluster_header_descriptor and its fields are accessed without verifying that the buffer is large enough. If the device returns a smaller than expected length, this leads to an out-of-bounds read.
Add a length check to ensure the buffer is large enough for uac3_cluster_header_descriptor.
--- sound/usb/stream.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/stream.c +2 -0
@@ -979,6 +979,8 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,* and request Cluster Descriptor */ wLength =le16_to_cpu (hc_header.wLength); +if (wLength <sizeof (cluster)) +return NULL ; cluster =kzalloc (wLength,GFP_KERNEL );if (!cluster)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 38/148 attach_recursive_mnt(): do not lock the covering tree when sliding something under it
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit ce7df19686530920f2f6b636e71ce5eb1d9303ef ]
If we are propagating across the userns boundary, we need to lock the mounts added there. However, in case when something has already been mounted there and we end up sliding a new tree under that, the stuff that had been there before should not get locked.
IOW, lock_mnt_tree() should be called before we reparent the preexisting tree on top of what we are adding.
--- fs/namespace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/namespace.c +4 -4
@@ -2124,14 +2124,14 @@ static int attach_recursive_mnt(struct mount *source_mnt,hlist_for_each_entry_safe (child, n, &tree_list, mnt_hash) {struct mount *q;hlist_del_init (&child->mnt_hash); - q =__lookup_mnt (&child->mnt_parent->mnt, - child->mnt_mountpoint); -if (q) -mnt_change_mountpoint (child, smp, q);/* Notice when we are propagating across user namespaces */ if (child->mnt_parent->mnt_ns->user_ns != user_ns)lock_mnt_tree (child); child->mnt.mnt_flags &= ~MNT_LOCKED ; + q =__lookup_mnt (&child->mnt_parent->mnt, + child->mnt_mountpoint); +if (q) +mnt_change_mountpoint (child, smp, q);commit_tree (child); }put_mountpoint (smp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 39/148 wifi: mac80211: fix beacon interval calculation overflow
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lachlan Hodges <[email protected]>
[ Upstream commit 7a3750ff0f2e8fee338a9c168f429f6c37f0e820 ]
As we are converting from TU to usecs, a beacon interval of 100*1024 usecs will lead to integer wrapping. To fix change to use a u32.
--- net/mac80211/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/util.c +1 -1
@@ -3807,7 +3807,7 @@ void ieee80211_recalc_dtim(struct ieee80211_local *local, {u64 tsf =drv_get_tsf (local, sdata);u64 dtim_count =0 ; -u16 beacon_int = sdata->vif.bss_conf.beacon_int *1024 ; +u32 beacon_int = sdata->vif.bss_conf.beacon_int *1024 ;u8 dtim_period = sdata->vif.bss_conf.dtim_period;struct ps_data *ps;u8 bcns_from_dtim;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 40/148 vsock/uapi: fix linux/vm_sockets.h userspace compilation errors
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefano Garzarella <[email protected]>
[ Upstream commit 22bbc1dcd0d6785fb390c41f0dd5b5e218d23bdd ]
If a userspace application just include <linux/vm_sockets.h> will fail to build with the following errors:
/usr/include/linux/vm_sockets.h:182:39: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr’
182 | unsigned char svm_zero[sizeof(struct sockaddr) -
| ^~~~~~
/usr/include/linux/vm_sockets.h:183:39: error: ‘sa_family_t’ undeclared here (not in a function)
183 | sizeof(sa_family_t) -
|
Include <sys/socket.h> for userspace (guarded by ifndef __KERNEL__) where struct sockaddr and sa_family_t are defined.
We already do something similar in <linux/mptcp.h> and <linux/if.h>.
--- include/uapi/linux/vm_sockets.h | 4 ++++ 1 file changed, 4 insertions(+)
include/uapi/linux/vm_sockets.h +4 -0
@@ -17,6 +17,10 @@#ifndef _UAPI_VM_SOCKETS_H#define _UAPI_VM_SOCKETS_H +#ifndef __KERNEL__ +#include <sys/socket.h> /* for struct sockaddr and sa_family_t */ +#endif +#include <linux/socket.h> /* Option name for STREAM socket buffer size. Use as the option name in
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 41/148 um: ubd: Add missing error check in start_io_thread()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiwei Bie <[email protected]>
[ Upstream commit c55c7a85e02a7bfee20a3ffebdff7cbeb41613ef ]
The subsequent call to os_set_fd_block() overwrites the previous return value. OR the two return values together to fix it.
--- arch/um/drivers/ubd_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/drivers/ubd_user.c +1 -1
@@ -41,7 +41,7 @@ int start_io_thread(unsigned long sp, int *fd_out) *fd_out = fds[1 ]; err =os_set_fd_block (*fd_out,0 ); - err =os_set_fd_block (kernel_fd,0 ); + err |=os_set_fd_block (kernel_fd,0 );if (err) {printk ("start_io_thread - failed to set nonblocking I/O.\n" ); goto out_close;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 32/148 media: vivid: Change the siize of the composing
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Arefev <[email protected]>
[ Upstream commit f83ac8d30c43fd902af7c84c480f216157b60ef0 ]
syzkaller found a bug:
BUG: KASAN: vmalloc-out-of-bounds in tpg_fill_plane_pattern drivers/media/common/v4l2-tpg/v4l2-tpg-core.c:2608 [inline] BUG: KASAN: vmalloc-out-of-bounds in tpg_fill_plane_buffer+0x1a9c/0x5af0 drivers/media/common/v4l2-tpg/v4l2-tpg-core.c:2705 Write of size 1440 at addr ffffc9000d0ffda0 by task vivid-000-vid-c/5304 CPU: 0 UID: 0 PID: 5304 Comm: vivid-000-vid-c Not tainted 6.14.0-rc2-syzkaller-00039-g09fbf3d50205 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0x169/0x550 mm/kasan/report.c:489 kasan_report+0x143/0x180 mm/kasan/report.c:602 kasan_check_range+0x282/0x290 mm/kasan/generic.c:189 __asan_memcpy+0x40/0x70 mm/kasan/shadow.c:106 tpg_fill_plane_pattern drivers/media/common/v4l2-tpg/v4l2-tpg-core.c:2608 [inline] tpg_fill_plane_buffer+0x1a9c/0x5af0 drivers/media/common/v4l2-tpg/v4l2-tpg-core.c:2705 vivid_fillbuff drivers/media/test-drivers/vivid/vivid-kthread-cap.c:470 [inline] vivid_thread_vid_cap_tick+0xf8e/0x60d0 drivers/media/test-drivers/vivid/vivid-kthread-cap.c:629 vivid_thread_vid_cap+0x8aa/0xf30 drivers/media/test-drivers/vivid/vivid-kthread-cap.c:767 kthread+0x7a9/0x920 kernel/kthread.c:464 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:148 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 </TASK>
The composition size cannot be larger than the size of fmt_cap_rect. So execute v4l2_rect_map_inside() even if has_compose_cap == 0.
--- drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vivid/vivid-vid-cap.c +1 -1
@@ -935,8 +935,8 @@ int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selectionif (dev->has_compose_cap) {v4l2_rect_set_min_size (compose, &min_rect);v4l2_rect_set_max_size (compose, &max_rect); -v4l2_rect_map_inside (compose, &fmt); } +v4l2_rect_map_inside (compose, &fmt); dev->fmt_cap_rect = fmt;tpg_s_buf_height (&dev->tpg, fmt.height); }else if (dev->has_compose_cap) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 67/148 lib: test_objagg: Set error message in check_expect_hints_stats()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit e6ed134a4ef592fe1fd0cafac9683813b3c8f3e8 ]
Smatch complains that the error message isn't set in the caller:
lib/test_objagg.c:923 test_hints_case2()
error: uninitialized symbol 'errmsg'.
This static checker warning only showed up after a recent refactoring but the bug dates back to when the code was originally added. This likely doesn't affect anything in real life.
--- lib/test_objagg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/test_objagg.c +3 -1
@@ -899,8 +899,10 @@ static int check_expect_hints_stats(struct objagg_hints *objagg_hints,int err; stats =objagg_hints_stats_get (objagg_hints); -if (IS_ERR (stats)) +if (IS_ERR (stats)) { + *errmsg ="objagg_hints_stats_get() failed." ;return PTR_ERR (stats); + } err =__check_expect_stats (stats, expect_stats, errmsg);objagg_stats_put (stats);return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 76/148 wifi: ath6kl: remove WARN on bad firmware input
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit e7417421d89358da071fd2930f91e67c7128fbff ]
If the firmware gives bad input, that's nothing to do with the driver's stack at this point etc., so the WARN_ON() doesn't add any value. Additionally, this is one of the top syzbot reports now. Just print a message, and as an added bonus, print the sizes too.
--- drivers/net/wireless/ath/ath6kl/bmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/bmi.c +3 -1
@@ -87,7 +87,9 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar,* We need to do some backwards compatibility to make this work. */ if (le32_to_cpu (targ_info->byte_count) !=sizeof (*targ_info)) { -WARN_ON (1 ); +ath6kl_err ("mismatched byte count %d vs. expected %zd\n" , +le32_to_cpu (targ_info->byte_count), +sizeof (*targ_info));return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 77/148 ACPICA: Refuse to evaluate a method if arguments are missing
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 6fcab2791543924d438e7fa49276d0998b0a069f ]
As reported in [1], a platform firmware update that increased the number of method parameters and forgot to update a least one of its callers, caused ACPICA to crash due to use-after-free.
Since this a result of a clear AML issue that arguably cannot be fixed up by the interpreter (it cannot produce missing data out of thin air), address it by making ACPICA refuse to evaluate a method if the caller attempts to pass fewer arguments than expected to it.
--- drivers/acpi/acpica/dsmethod.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/acpi/acpica/dsmethod.c +7 -0
@@ -483,6 +483,13 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,return_ACPI_STATUS (AE_NULL_OBJECT ); } +if (this_walk_state->num_operands < obj_desc->method.param_count) { +ACPI_ERROR ((AE_INFO ,"Missing argument for method [%4.4s]" , +acpi_ut_get_node_name (method_node))); + +return_ACPI_STATUS (AE_AML_UNINITIALIZED_ARG ); + } +/* Init for new method, possibly wait on method mutex */ status =
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 78/148 rcu: Return early if callback is not specified
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uladzislau Rezki (Sony) <[email protected]>
[ Upstream commit 33b6a1f155d627f5bd80c7485c598ce45428f74f ]
Currently the call_rcu() API does not check whether a callback pointer is NULL. If NULL is passed, rcu_core() will try to invoke it, resulting in NULL pointer dereference and a kernel crash.
To prevent this and improve debuggability, this patch adds a check for NULL and emits a kernel stack trace to help identify a faulty caller.
--- kernel/rcu/tree.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/rcu/tree.c +4 -0
@@ -2568,6 +2568,10 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func, bool lazy)/* Misaligned rcu_head! */ WARN_ON_ONCE ((unsigned long )head & (sizeof (void *) -1 )); +/* Avoid NULL dereference if callback is NULL. */ +if (WARN_ON_ONCE (!func)) +return ; +if (debug_rcu_head_queue (head)) {/* * Probable double call_rcu(), so leak the callback.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 79/148 regulator: gpio: Add input_supply support in gpio_regulator_config
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Neanne <[email protected]>
[ Upstream commit adfdfcbdbd32b356323a3db6d3a683270051a7e6 ]
This is simillar as fixed-regulator.
Used to extract regulator parent from the device tree.
Without that property used, the parent regulator can be shut down (if not an always on). Thus leading to inappropriate behavior:
On am62-SP-SK this fix is required to avoid tps65219 ldo1 (SDMMC rail) to be shut down after boot completion.
Stable-dep-of: c9764fd88bc7 ("regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods")
--- drivers/regulator/gpio-regulator.c | 15 +++++++++++++++ include/linux/regulator/gpio-regulator.h | 2 ++ 2 files changed, 17 insertions(+)
drivers/regulator/gpio-regulator.c +15 -0
@@ -213,6 +213,9 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np, regtype); } +if (of_find_property (np,"vin-supply" ,NULL )) + config->input_supply ="vin" ; +return config; }
@@ -252,6 +255,18 @@ static int gpio_regulator_probe(struct platform_device *pdev) drvdata->gpiods =devm_kzalloc (dev,sizeof (struct gpio_desc *),GFP_KERNEL ); + +if (config->input_supply) { + drvdata->desc.supply_name =devm_kstrdup (&pdev->dev, + config->input_supply, +GFP_KERNEL ); +if (!drvdata->desc.supply_name) { +dev_err (&pdev->dev, +"Failed to allocate input supply\n" ); +return -ENOMEM ; + } + } +if (!drvdata->gpiods)return -ENOMEM ;for (i =0 ; i < config->ngpios; i++) {
include/linux/regulator/gpio-regulator.h +2 -0
@@ -42,6 +42,7 @@ struct gpio_regulator_state {/** * struct gpio_regulator_config - config structure * @supply_name: Name of the regulator supply +* @input_supply: Name of the input regulator supply * @enabled_at_boot: Whether regulator has been enabled at * boot or not. 1 = Yes, 0 = No * This is used to keep the regulator at
@@ -62,6 +63,7 @@ struct gpio_regulator_state {*/ struct gpio_regulator_config {const char *supply_name; +const char *input_supply;unsigned enabled_at_boot:1 ;unsigned startup_delay;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 80/148 regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit c9764fd88bc744592b0604ccb6b6fc1a5f76b4e3 ]
drvdata::gpiods is supposed to hold an array of 'gpio_desc' pointers. But the memory is allocated for only one pointer. This will lead to out-of-bounds access later in the code if 'config::ngpios' is > 1. So fix the code to allocate enough memory to hold 'config::ngpios' of GPIO descriptors.
While at it, also move the check for memory allocation failure to be below the allocation to make it more readable.
--- drivers/regulator/gpio-regulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/regulator/gpio-regulator.c +4 -4
@@ -253,8 +253,10 @@ static int gpio_regulator_probe(struct platform_device *pdev)return -ENOMEM ; } - drvdata->gpiods =devm_kzalloc (dev,sizeof (struct gpio_desc *), -GFP_KERNEL ); + drvdata->gpiods =devm_kcalloc (dev, config->ngpios, +sizeof (struct gpio_desc *),GFP_KERNEL ); +if (!drvdata->gpiods) +return -ENOMEM ;if (config->input_supply) { drvdata->desc.supply_name = devm_kstrdup(&pdev->dev,
@@ -267,8 +269,6 @@ static int gpio_regulator_probe(struct platform_device *pdev) } } -if (!drvdata->gpiods) -return -ENOMEM ;for (i =0 ; i < config->ngpios; i++) { drvdata->gpiods[i] = devm_gpiod_get_index(dev, NULL,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 81/148 mmc: mediatek: use data instead of mrq parameter from msdc_{un}prepare_data()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yue Hu <[email protected]>
[ Upstream commit 151071351bb6f3d1861e99a22c4cebadf81911a0 ]
We already have 'mrq->data' before calling these two functions, no need to find it again via 'mrq->data' internally. Also remove local data variable accordingly.
Stable-dep-of: f5de469990f1 ("mtk-sd: Prevent memory corruption from DMA map failure")
--- drivers/mmc/host/mtk-sd.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/mmc/host/mtk-sd.c +8 -12
@@ -676,10 +676,8 @@ static inline void msdc_dma_setup(struct msdc_host *host, struct msdc_dma *dma,writel (lower_32_bits (dma->gpd_addr), host->base +MSDC_DMA_SA ); } -static void msdc_prepare_data (struct msdc_host *host,struct mmc_request *mrq) +static void msdc_prepare_data (struct msdc_host *host,struct mmc_data *data) { -struct mmc_data *data = mrq->data; -if (!(data->host_cookie &MSDC_PREPARE_FLAG )) { data->sg_count =dma_map_sg (host->dev, data->sg, data->sg_len,mmc_get_dma_dir (data));
@@ -688,10 +686,8 @@ static void msdc_prepare_data(struct msdc_host *host, struct mmc_request *mrq) } } -static void msdc_unprepare_data (struct msdc_host *host,struct mmc_request *mrq) +static void msdc_unprepare_data (struct msdc_host *host,struct mmc_data *data) { -struct mmc_data *data = mrq->data; -if (data->host_cookie &MSDC_ASYNC_FLAG )return ;
@@ -1034,7 +1030,7 @@ static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq)msdc_track_cmd_data (host, mrq->cmd, mrq->data);if (mrq->data) -msdc_unprepare_data (host, mrq); +msdc_unprepare_data (host, mrq->data);if (host->error)msdc_reset_hw (host);mmc_request_done (host->mmc, mrq);
@@ -1203,7 +1199,7 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) host->mrq = mrq;if (mrq->data) -msdc_prepare_data (host, mrq); +msdc_prepare_data (host, mrq->data);/* if SBC is required, we have HW option and SW option. * if HW option is enabled, and SBC does not have "special" flags,
@@ -1224,7 +1220,7 @@ static void msdc_pre_req(struct mmc_host *mmc, struct mmc_request *mrq)if (!data)return ; -msdc_prepare_data (host, mrq); +msdc_prepare_data (host, data); data->host_cookie |=MSDC_ASYNC_FLAG ; }
@@ -1232,14 +1228,14 @@ static void msdc_post_req(struct mmc_host *mmc, struct mmc_request *mrq, int err) {struct msdc_host *host =mmc_priv (mmc); -struct mmc_data *data; +struct mmc_data *data = mrq->data; - data = mrq->data;if (!data)return ; +if (data->host_cookie) { data->host_cookie &= ~MSDC_ASYNC_FLAG ; -msdc_unprepare_data (host, mrq); +msdc_unprepare_data (host, data); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 82/148 mtk-sd: Prevent memory corruption from DMA map failure
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
[ Upstream commit f5de469990f19569627ea0dd56536ff5a13beaa3 ]
If msdc_prepare_data() fails to map the DMA region, the request is not prepared for data receiving, but msdc_start_data() proceeds the DMA with previous setting.
Since this will lead a memory corruption, we have to stop the request operation soon after the msdc_prepare_data() fails to prepare it.
--- drivers/mmc/host/mtk-sd.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/mmc/host/mtk-sd.c +16 -1
@@ -686,6 +686,11 @@ static void msdc_prepare_data(struct msdc_host *host, struct mmc_data *data) } } +static bool msdc_data_prepared (struct mmc_data *data) +{ +return data->host_cookie &MSDC_PREPARE_FLAG ; +} +static void msdc_unprepare_data (struct msdc_host *host,struct mmc_data *data) {if (data->host_cookie &MSDC_ASYNC_FLAG )
@@ -1198,8 +1203,18 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq)WARN_ON (host->mrq); host->mrq = mrq; -if (mrq->data) +if (mrq->data) {msdc_prepare_data (host, mrq->data); +if (!msdc_data_prepared (mrq->data)) { +/* +* Failed to prepare DMA area, fail fast before +* starting any commands. +*/ + mrq->cmd->error = -ENOSPC ; +mmc_request_done (mmc_from_priv (host), mrq); +return ; + } + }/* if SBC is required, we have HW option and SW option. * if HW option is enabled, and SBC does not have "special" flags,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 83/148 mtk-sd: reset host->mrq on prepare_data() error
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Senozhatsky <[email protected]>
[ Upstream commit ec54c0a20709ed6e56f40a8d59eee725c31a916b ]
Do not leave host with dangling ->mrq pointer if we hit the msdc_prepare_data() error out path.
--- drivers/mmc/host/mtk-sd.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/mtk-sd.c +1 -0
@@ -1206,6 +1206,7 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq)if (mrq->data) {msdc_prepare_data (host, mrq->data);if (!msdc_data_prepared (mrq->data)) { + host->mrq =NULL ;/* * Failed to prepare DMA area, fail fast before * starting any commands.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 84/148 drm/v3d: Disable interrupts before resetting the GPU
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maíra Canal <[email protected]>
[ Upstream commit 226862f50a7a88e4e4de9abbf36c64d19acd6fd0 ]
Currently, an interrupt can be triggered during a GPU reset, which can lead to GPU hangs and NULL pointer dereference in an interrupt context as shown in the following trace:
[ 314.035040] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000c0 [ 314.043822] Mem abort info: [ 314.046606] ESR = 0x0000000096000005 [ 314.050347] EC = 0x25: DABT (current EL), IL = 32 bits [ 314.055651] SET = 0, FnV = 0 [ 314.058695] EA = 0, S1PTW = 0 [ 314.061826] FSC = 0x05: level 1 translation fault [ 314.066694] Data abort info: [ 314.069564] ISV = 0, ISS = 0x00000005, ISS2 = 0x00000000 [ 314.075039] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 314.080080] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 314.085382] user pgtable: 4k pages, 39-bit VAs, pgdp=0000000102728000 [ 314.091814] [00000000000000c0] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000 [ 314.100511] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP [ 314.106770] Modules linked in: v3d i2c_brcmstb vc4 snd_soc_hdmi_codec gpu_sched drm_shmem_helper drm_display_helper cec drm_dma_helper drm_kms_helper drm drm_panel_orientation_quirks snd_soc_core snd_compress snd_pcm_dmaengine snd_pcm snd_timer snd backlight [ 314.129654] CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 6.12.25+rpt-rpi-v8 #1 Debian 1:6.12.25-1+rpt1 [ 314.139388] Hardware name: Raspberry Pi 4 Model B Rev 1.4 (DT) [ 314.145211] pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 314.152165] pc : v3d_irq+0xec/0x2e0 [v3d] [ 314.156187] lr : v3d_irq+0xe0/0x2e0 [v3d] [ 314.160198] sp : ffffffc080003ea0 [ 314.163502] x29: ffffffc080003ea0 x28: ffffffec1f184980 x27: 021202b000000000 [ 314.170633] x26: ffffffec1f17f630 x25: ffffff8101372000 x24: ffffffec1f17d9f0 [ 314.177764] x23: 000000000000002a x22: 000000000000002a x21: ffffff8103252000 [ 314.184895] x20: 0000000000000001 x19: 00000000deadbeef x18: 0000000000000000 [ 314.192026] x17: ffffff94e51d2000 x16: ffffffec1dac3cb0 x15: c306000000000000 [ 314.199156] x14: 0000000000000000 x13: b2fc982e03cc5168 x12: 0000000000000001 [ 314.206286] x11: ffffff8103f8bcc0 x10: ffffffec1f196868 x9 : ffffffec1dac3874 [ 314.213416] x8 : 0000000000000000 x7 : 0000000000042a3a x6 : ffffff810017a180 [ 314.220547] x5 : ffffffec1ebad400 x4 : ffffffec1ebad320 x3 : 00000000000bebeb [ 314.227677] x2 : 0000000000000000 x1 : 0000000000000000 x0 : 0000000000000000 [ 314.234807] Call trace: [ 314.237243] v3d_irq+0xec/0x2e0 [v3d] [ 314.240906] __handle_irq_event_percpu+0x58/0x218 [ 314.245609] handle_irq_event+0x54/0xb8 [ 314.249439] handle_fasteoi_irq+0xac/0x240 [ 314.253527] handle_irq_desc+0x48/0x68 [ 314.257269] generic_handle_domain_irq+0x24/0x38 [ 314.261879] gic_handle_irq+0x48/0xd8 [ 314.265533] call_on_irq_stack+0x24/0x58 [ 314.269448] do_interrupt_handler+0x88/0x98 [ 314.273624] el1_interrupt+0x34/0x68 [ 314.277193] el1h_64_irq_handler+0x18/0x28 [ 314.281281] el1h_64_irq+0x64/0x68 [ 314.284673] default_idle_call+0x3c/0x168 [ 314.288675] do_idle+0x1fc/0x230 [ 314.291895] cpu_startup_entry+0x3c/0x50 [ 314.295810] rest_init+0xe4/0xf0 [ 314.299030] start_kernel+0x5e8/0x790 [ 314.302684] __primary_switched+0x80/0x90 [ 314.306691] Code: 940029eb 360ffc13 f9442ea0 52800001 (f9406017) [ 314.312775] ---[ end trace 0000000000000000 ]--- [ 314.317384] Kernel panic - not syncing: Oops: Fatal exception in interrupt [ 314.324249] SMP: stopping secondary CPUs [ 314.328167] Kernel Offset: 0x2b9da00000 from 0xffffffc080000000 [ 314.334076] PHYS_OFFSET: 0x0 [ 314.336946] CPU features: 0x08,00002013,c0200000,0200421b [ 314.342337] Memory Limit: none [ 314.345382] ---[ end Kernel panic - not syncing: Oops: Fatal exception in interrupt ]---
Before resetting the GPU, it's necessary to disable all interrupts and deal with any interrupt handler still in-flight. Otherwise, the GPU might reset with jobs still running, or yet, an interrupt could be handled during the reset.
--- drivers/gpu/drm/v3d/v3d_drv.h | 9 +++++++++ drivers/gpu/drm/v3d/v3d_gem.c | 2 ++ drivers/gpu/drm/v3d/v3d_irq.c | 36 +++++++++++++++++++++++++++-------- 3 files changed, 39 insertions(+), 8 deletions(-)
drivers/gpu/drm/v3d/v3d_drv.h +9 -0
@@ -38,6 +38,12 @@ struct v3d_queue_state {u64 emit_seqno; }; +enum v3d_irq { +V3D_CORE_IRQ , +V3D_HUB_IRQ , +V3D_MAX_IRQS , +}; +struct v3d_dev {struct drm_device drm;
@@ -49,6 +55,9 @@ struct v3d_dev {struct device *dev;struct platform_device *pdev; + +int irq[V3D_MAX_IRQS ]; +void __iomem *hub_regs;void __iomem *core_regs[3 ];void __iomem *bridge_regs;
drivers/gpu/drm/v3d/v3d_gem.c +2 -0
@@ -120,6 +120,8 @@ v3d_reset(struct v3d_dev *v3d)if (false)v3d_idle_axi (v3d,0 ); +v3d_irq_disable (v3d); +v3d_idle_gca (v3d);v3d_reset_v3d (v3d);
drivers/gpu/drm/v3d/v3d_irq.c +28 -8
@@ -218,7 +218,7 @@ v3d_hub_irq(int irq, void *arg)int v3d_irq_init (struct v3d_dev *v3d) { -int irq1, ret, core; +int irq, ret, core;INIT_WORK (&v3d->overflow_mem_work, v3d_overflow_mem_work);
@@ -229,16 +229,24 @@ v3d_irq_init(struct v3d_dev *v3d)V3D_CORE_WRITE (core,V3D_CTL_INT_CLR ,V3D_CORE_IRQS );V3D_WRITE (V3D_HUB_INT_CLR ,V3D_HUB_IRQS ); - irq1 =platform_get_irq (v3d->pdev,1 ); -if (irq1 == -EPROBE_DEFER ) -return irq1; -if (irq1 >0 ) { - ret =devm_request_irq (v3d->dev, irq1, + irq =platform_get_irq (v3d->pdev,1 ); +if (irq == -EPROBE_DEFER ) +return irq; +if (irq >0 ) { + v3d->irq[V3D_CORE_IRQ ] = irq; + + ret =devm_request_irq (v3d->dev, v3d->irq[V3D_CORE_IRQ ], v3d_irq,IRQF_SHARED ,"v3d_core0" , v3d);if (ret) goto fail; - ret =devm_request_irq (v3d->dev,platform_get_irq (v3d->pdev,0 ), + + irq =platform_get_irq (v3d->pdev,0 ); +if (irq <0 ) +return irq; + v3d->irq[V3D_HUB_IRQ ] = irq; + + ret =devm_request_irq (v3d->dev, v3d->irq[V3D_HUB_IRQ ], v3d_hub_irq,IRQF_SHARED ,"v3d_hub" , v3d);if (ret)
@@ -246,7 +254,12 @@ v3d_irq_init(struct v3d_dev *v3d) }else { v3d->single_irq_line = true; - ret =devm_request_irq (v3d->dev,platform_get_irq (v3d->pdev,0 ), + irq =platform_get_irq (v3d->pdev,0 ); +if (irq <0 ) +return irq; + v3d->irq[V3D_CORE_IRQ ] = irq; + + ret =devm_request_irq (v3d->dev, v3d->irq[V3D_CORE_IRQ ], v3d_irq,IRQF_SHARED ,"v3d" , v3d);if (ret)
@@ -281,12 +294,19 @@ void v3d_irq_disable(struct v3d_dev *v3d) {int core; +int i;/* Disable all interrupts. */ for (core =0 ; core < v3d->cores; core++)V3D_CORE_WRITE (core,V3D_CTL_INT_MSK_SET , ~0 );V3D_WRITE (V3D_HUB_INT_MSK_SET , ~0 ); +/* Finish any interrupt handler still in flight. */ +for (i =0 ; i <V3D_MAX_IRQS ; i++) { +if (v3d->irq[i]) +synchronize_irq (v3d->irq[i]); + } +/* Clear any pending interrupts we might have left. */ for (core =0 ; core < v3d->cores; core++)V3D_CORE_WRITE (core,V3D_CTL_INT_CLR ,V3D_CORE_IRQS );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 85/148 scsi: ufs: core: Fix spelling of a sysfs attribute name
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 021f243627ead17eb6500170256d3d9be787dad8 ]
Change "resourse" into "resource" in the name of a sysfs attribute.
--- Documentation/ABI/testing/sysfs-driver-ufs | 2 +- drivers/scsi/ufs/ufs-sysfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Documentation/ABI/testing/sysfs-driver-ufs +1 -1
@@ -589,7 +589,7 @@ Description: This file shows the thin provisioning type. This is one of about the descriptor could be found at UFS specifications 2.1. The file is read only. -What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count +What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count Date: February 2018 Contact: Stanislav Nijnikov <[email protected]> Description: This file shows the total physical memory resources. This is
drivers/scsi/ufs/ufs-sysfs.c +2 -2
@@ -753,7 +753,7 @@ UFS_UNIT_DESC_PARAM(logical_block_size, _LOGICAL_BLK_SIZE, 1);UFS_UNIT_DESC_PARAM (logical_block_count, _LOGICAL_BLK_COUNT,8 );UFS_UNIT_DESC_PARAM (erase_block_size, _ERASE_BLK_SIZE,4 );UFS_UNIT_DESC_PARAM (provisioning_type, _PROVISIONING_TYPE,1 ); -UFS_UNIT_DESC_PARAM (physical_memory_resourse_count, _PHY_MEM_RSRC_CNT,8 ); +UFS_UNIT_DESC_PARAM (physical_memory_resource_count, _PHY_MEM_RSRC_CNT,8 );UFS_UNIT_DESC_PARAM (context_capabilities, _CTX_CAPABILITIES,2 );UFS_UNIT_DESC_PARAM (large_unit_granularity, _LARGE_UNIT_SIZE_M1,1 );
@@ -768,7 +768,7 @@ static struct attribute *ufs_sysfs_unit_descriptor[] = { &dev_attr_logical_block_count.attr, &dev_attr_erase_block_size.attr, &dev_attr_provisioning_type.attr, - &dev_attr_physical_memory_resourse_count.attr, + &dev_attr_physical_memory_resource_count.attr, &dev_attr_context_capabilities.attr, &dev_attr_large_unit_granularity.attr, NULL,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 68/148 amd-xgbe: align CL37 AN sequence as per databook
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raju Rangoju <[email protected]>
[ Upstream commit 42fd432fe6d320323215ebdf4de4d0d7e56e6792 ]
Update the Clause 37 Auto-Negotiation implementation to properly align with the PCS hardware specifications:
- Fix incorrect bit settings in Link Status and Link Duplex fields
- Implement missing sequence steps 2 and 7
These changes ensure CL37 auto-negotiation protocol follows the exact sequence patterns as specified in the hardware databook.
--- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 ++ drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 9 +++++++++ drivers/net/ethernet/amd/xgbe/xgbe.h | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-common.h +2 -0
@@ -1355,6 +1355,8 @@#define MDIO_VEND2_CTRL1_SS13 BIT(13)#endif +#define XGBE_VEND2_MAC_AUTO_SW BIT(9) +/* MDIO mask values */ #define XGBE_AN_CL73_INT_CMPLT BIT(0)#define XGBE_AN_CL73_INC_LINK BIT(1)
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +9 -0
@@ -363,6 +363,10 @@ static void xgbe_an37_set(struct xgbe_prv_data *pdata, bool enable, reg |=MDIO_VEND2_CTRL1_AN_RESTART ;XMDIO_WRITE (pdata,MDIO_MMD_VEND2 ,MDIO_CTRL1 , reg); + + reg =XMDIO_READ (pdata,MDIO_MMD_VEND2 ,MDIO_PCS_DIG_CTRL ); + reg |=XGBE_VEND2_MAC_AUTO_SW ; +XMDIO_WRITE (pdata,MDIO_MMD_VEND2 ,MDIO_PCS_DIG_CTRL , reg); }static void xgbe_an37_restart (struct xgbe_prv_data *pdata)
@@ -991,6 +995,11 @@ static void xgbe_an37_init(struct xgbe_prv_data *pdata)netif_dbg (pdata, link, pdata->netdev,"CL37 AN (%s) initialized\n" , (pdata->an_mode ==XGBE_AN_MODE_CL37 ) ?"BaseX" :"SGMII" ); + + reg =XMDIO_READ (pdata,MDIO_MMD_AN ,MDIO_CTRL1 ); + reg &= ~MDIO_AN_CTRL1_ENABLE ; +XMDIO_WRITE (pdata,MDIO_MMD_AN ,MDIO_CTRL1 , reg); + }static void xgbe_an73_init (struct xgbe_prv_data *pdata)
drivers/net/ethernet/amd/xgbe/xgbe.h +2 -2
@@ -292,11 +292,11 @@#define XGBE_LINK_TIMEOUT 5#define XGBE_KR_TRAINING_WAIT_ITER 50 -#define XGBE_SGMII_AN_LINK_STATUS BIT(1) +#define XGBE_SGMII_AN_LINK_DUPLEX BIT(1)#define XGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3))#define XGBE_SGMII_AN_LINK_SPEED_100 0x04#define XGBE_SGMII_AN_LINK_SPEED_1000 0x08 -#define XGBE_SGMII_AN_LINK_DUPLEX BIT(4) +#define XGBE_SGMII_AN_LINK_STATUS BIT(4)/* ECC correctable error notification window (seconds) */ #define XGBE_ECC_LIMIT 60
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 86/148 RDMA/core: Create and destroy counters in the ib_core
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 3b023e1b680a56e84c22d43486875a5aa4c78afe ]
Move allocation and destruction of counters under ib_core responsibility
Stable-dep-of: acd245b1e33f ("RDMA/mlx5: Fix CC counters query for MPV")
--- drivers/infiniband/core/device.c | 1 + .../core/uverbs_std_types_counters.c | 17 ++++++++-------- drivers/infiniband/hw/mlx5/main.c | 20 ++++++------------- include/rdma/ib_verbs.h | 7 ++++--- 4 files changed, 20 insertions(+), 25 deletions(-)
drivers/infiniband/core/device.c +1 -0
@@ -2683,6 +2683,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, unmap_fmr);SET_OBJ_SIZE (dev_ops, ib_ah); +SET_OBJ_SIZE (dev_ops, ib_counters);SET_OBJ_SIZE (dev_ops, ib_cq);SET_OBJ_SIZE (dev_ops, ib_pd);SET_OBJ_SIZE (dev_ops, ib_srq);
drivers/infiniband/core/uverbs_std_types_counters.c +9 -8
@@ -46,7 +46,9 @@ static int uverbs_free_counters(struct ib_uobject *uobject,if (ret)return ret; -return counters->device->ops.destroy_counters (counters); + counters->device->ops.destroy_counters (counters); +kfree (counters); +return 0 ; } static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_CREATE)(
@@ -66,20 +68,19 @@ static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_CREATE)(if (!ib_dev->ops.create_counters)return -EOPNOTSUPP ; - counters = ib_dev->ops.create_counters (ib_dev, attrs); -if (IS_ERR (counters)) { - ret =PTR_ERR (counters); - goto err_create_counters; - } + counters =rdma_zalloc_drv_obj (ib_dev, ib_counters); +if (!counters) +return -ENOMEM ; counters->device = ib_dev; counters->uobject = uobj; uobj->object = counters;atomic_set (&counters->usecnt,0 ); -return 0 ; + ret = ib_dev->ops.create_counters (counters, attrs); +if (ret) +kfree (counters); -err_create_counters:return ret; }
drivers/infiniband/hw/mlx5/main.c +6 -14
@@ -6113,7 +6113,7 @@ static int mlx5_ib_read_counters(struct ib_counters *counters,return ret; } -static int mlx5_ib_destroy_counters (struct ib_counters *counters) +static void mlx5_ib_destroy_counters (struct ib_counters *counters) {struct mlx5_ib_mcounters *mcounters =to_mcounters (counters);
@@ -6121,24 +6121,15 @@ static int mlx5_ib_destroy_counters(struct ib_counters *counters)if (mcounters->hw_cntrs_hndl)mlx5_fc_destroy (to_mdev (counters->device)->mdev, mcounters->hw_cntrs_hndl); - -kfree (mcounters); - -return 0 ; } -static struct ib_counters *mlx5_ib_create_counters (struct ib_device *device, -struct uverbs_attr_bundle *attrs) +static int mlx5_ib_create_counters (struct ib_counters *counters, +struct uverbs_attr_bundle *attrs) { -struct mlx5_ib_mcounters *mcounters; - - mcounters =kzalloc (sizeof (*mcounters),GFP_KERNEL ); -if (!mcounters) -return ERR_PTR (-ENOMEM ); +struct mlx5_ib_mcounters *mcounters =to_mcounters (counters);mutex_init (&mcounters->mcntrs_mutex); - -return &mcounters->ibcntrs; +return 0 ; }static void mlx5_ib_stage_init_cleanup (struct mlx5_ib_dev *dev)
@@ -6296,6 +6287,7 @@ static const struct ib_device_ops mlx5_ib_dev_ops = { .resize_cq = mlx5_ib_resize_cq,INIT_RDMA_OBJ_SIZE (ib_ah, mlx5_ib_ah, ibah), +INIT_RDMA_OBJ_SIZE (ib_counters, mlx5_ib_mcounters, ibcntrs),INIT_RDMA_OBJ_SIZE (ib_cq, mlx5_ib_cq, ibcq),INIT_RDMA_OBJ_SIZE (ib_pd, mlx5_ib_pd, ibpd), INIT_RDMA_OBJ_SIZE(ib_srq, mlx5_ib_srq, ibsrq),
include/rdma/ib_verbs.h +4 -3
@@ -2468,9 +2468,9 @@ struct ib_device_ops {struct ib_mr *(*reg_dm_mr)(struct ib_pd *pd,struct ib_dm *dm,struct ib_dm_mr_attr *attr,struct uverbs_attr_bundle *attrs); -struct ib_counters *(*create_counters)( -struct ib_device *device,struct uverbs_attr_bundle *attrs); -int (*destroy_counters)(struct ib_counters *counters); +int (*create_counters)(struct ib_counters *counters, +struct uverbs_attr_bundle *attrs); +void (*destroy_counters)(struct ib_counters *counters);int (*read_counters)(struct ib_counters *counters,struct ib_counters_read_attr *counters_read_attr,struct uverbs_attr_bundle *attrs);
@@ -2563,6 +2563,7 @@ struct ib_device_ops {int (*counter_update_stats)(struct rdma_counter *counter);DECLARE_RDMA_OBJ_SIZE (ib_ah); +DECLARE_RDMA_OBJ_SIZE (ib_counters);DECLARE_RDMA_OBJ_SIZE (ib_cq);DECLARE_RDMA_OBJ_SIZE (ib_pd);DECLARE_RDMA_OBJ_SIZE (ib_srq);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 87/148 RDMA/mlx5: Fix CC counters query for MPV
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit acd245b1e33fc4b9d0f2e3372021d632f7ee0652 ]
In case, CC counters are querying for the second port use the correct core device for the query instead of always using the master core device.
--- drivers/infiniband/hw/mlx5/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/main.c +1 -1
@@ -5615,7 +5615,7 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev,*/ goto done; } - ret = mlx5_lag_query_cong_counters(dev->mdev, + ret = mlx5_lag_query_cong_counters(mdev, stats->value + cnts->num_q_counters, cnts->num_cong_counters,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 88/148 btrfs: propagate last_unlink_trans earlier when doing a rmdir
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit c466e33e729a0ee017d10d919cba18f503853c60 ]
In case the removed directory had a snapshot that was deleted, we are propagating its inode's last_unlink_trans to the parent directory after we removed the entry from the parent directory. This leaves a small race window where someone can log the parent directory after we removed the entry and before we updated last_unlink_trans, and as a result if we ever try to replay such a log tree, we will fail since we will attempt to remove a snapshot during log replay, which is currently not possible and results in the log replay (and mount) to fail. This is the type of failure described in commit 1ec9a1ae1e30 ("Btrfs: fix unreplayable log after snapshot delete + parent dir fsync").
So fix this by propagating the last_unlink_trans to the parent directory before we remove the entry from it.
--- fs/btrfs/inode.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
fs/btrfs/inode.c +18 -18
@@ -4747,7 +4747,6 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)int err =0 ;struct btrfs_root *root =BTRFS_I (dir)->root;struct btrfs_trans_handle *trans; -u64 last_unlink_trans;if (inode->i_size >BTRFS_EMPTY_DIR_SIZE )return -ENOTEMPTY ;
@@ -4758,6 +4757,23 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)if (IS_ERR (trans))return PTR_ERR (trans); +/* +* Propagate the last_unlink_trans value of the deleted dir to its +* parent directory. This is to prevent an unrecoverable log tree in the +* case we do something like this: +* 1) create dir foo +* 2) create snapshot under dir foo +* 3) delete the snapshot +* 4) rmdir foo +* 5) mkdir foo +* 6) fsync foo or some file inside foo +* +* This is because we can't unlink other roots when replaying the dir +* deletes for directory foo. +*/ +if (BTRFS_I (inode)->last_unlink_trans >= trans->transid) +BTRFS_I (dir)->last_unlink_trans =BTRFS_I (inode)->last_unlink_trans; +if (unlikely (btrfs_ino (BTRFS_I (inode)) ==BTRFS_EMPTY_SUBVOL_DIR_OBJECTID )) { err =btrfs_unlink_subvol (trans, dir, dentry); goto out;
@@ -4767,28 +4783,12 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)if (err) goto out; - last_unlink_trans =BTRFS_I (inode)->last_unlink_trans; -/* now the directory is empty */ err =btrfs_unlink_inode (trans, root,BTRFS_I (dir),BTRFS_I (d_inode (dentry)), dentry->d_name.name, dentry->d_name.len); -if (!err) { +if (!err)btrfs_i_size_write (BTRFS_I (inode),0 ); -/* -* Propagate the last_unlink_trans value of the deleted dir to -* its parent directory. This is to prevent an unrecoverable -* log tree in the case we do something like this: -* 1) create dir foo -* 2) create snapshot under dir foo -* 3) delete the snapshot -* 4) rmdir foo -* 5) mkdir foo -* 6) fsync foo or some file inside foo -*/ -if (last_unlink_trans >= trans->transid) -BTRFS_I (dir)->last_unlink_trans = last_unlink_trans; - } out:btrfs_end_transaction (trans);btrfs_btree_balance_dirty (root->fs_info);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 89/148 btrfs: use btrfs_record_snapshot_destroy() during rmdir
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 157501b0469969fc1ba53add5049575aadd79d80 ]
We are setting the parent directory's last_unlink_trans directly which may result in a concurrent task starting to log the directory not see the update and therefore can log the directory after we removed a child directory which had a snapshot within instead of falling back to a transaction commit. Replaying such a log tree would result in a mount failure since we can't currently delete snapshots (and subvolumes) during log replay. This is the type of failure described in commit 1ec9a1ae1e30 ("Btrfs: fix unreplayable log after snapshot delete + parent dir fsync").
Fix this by using btrfs_record_snapshot_destroy() which updates the last_unlink_trans field while holding the inode's log_mutex lock.
--- fs/btrfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/inode.c +1 -1
@@ -4772,7 +4772,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)* deletes for directory foo. */ if (BTRFS_I (inode)->last_unlink_trans >= trans->transid) -BTRFS_I (dir)->last_unlink_trans =BTRFS_I (inode)->last_unlink_trans; +btrfs_record_snapshot_destroy (trans,BTRFS_I (dir));if (unlikely (btrfs_ino (BTRFS_I (inode)) ==BTRFS_EMPTY_SUBVOL_DIR_OBJECTID )) { err =btrfs_unlink_subvol (trans, dir, dentry);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 90/148 ethernet: atl1: Add missing DMA mapping error checks and count errors
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit d72411d20905180cdc452c553be17481b24463d2 ]
The dma_map_XXX() functions can fail and must be checked using dma_mapping_error(). This patch adds proper error handling for all DMA mapping calls.
In atl1_alloc_rx_buffers(), if DMA mapping fails, the buffer is deallocated and marked accordingly.
In atl1_tx_map(), previously mapped buffers are unmapped and the packet is dropped on failure.
If atl1_xmit_frame() drops the packet, increment the tx_error counter.
--- drivers/net/ethernet/atheros/atlx/atl1.c | 78 +++++++++++++++++------- 1 file changed, 56 insertions(+), 22 deletions(-)
drivers/net/ethernet/atheros/atlx/atl1.c +56 -22
@@ -1863,14 +1863,21 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter)break ; } - buffer_info->alloced =1 ; - buffer_info->skb = skb; - buffer_info->length = (u16 ) adapter->rx_buffer_len; page =virt_to_page (skb->data); offset =offset_in_page (skb->data); buffer_info->dma =pci_map_page (pdev, page, offset, adapter->rx_buffer_len,PCI_DMA_FROMDEVICE ); +if (pci_dma_mapping_error (pdev, buffer_info->dma)) { +kfree_skb (skb); + adapter->soft_stats.rx_dropped++; +break ; + } + + buffer_info->alloced =1 ; + buffer_info->skb = skb; + buffer_info->length = (u16 )adapter->rx_buffer_len; + rfd_desc->buffer_addr =cpu_to_le64 (buffer_info->dma); rfd_desc->buf_len =cpu_to_le16 (adapter->rx_buffer_len); rfd_desc->coalese =0 ;
@@ -2182,8 +2189,8 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,return 0 ; } -static void atl1_tx_map (struct atl1_adapter *adapter,struct sk_buff *skb, -struct tx_packet_desc *ptpd) +static bool atl1_tx_map (struct atl1_adapter *adapter,struct sk_buff *skb, +struct tx_packet_desc *ptpd) {struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;struct atl1_buffer *buffer_info;
@@ -2193,6 +2200,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,unsigned int nr_frags;unsigned int f;int retval; +u16 first_mapped;u16 next_to_use;u16 data_len;u8 hdr_len;
@@ -2200,6 +2208,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, buf_len -= skb->data_len; nr_frags =skb_shinfo (skb)->nr_frags; next_to_use =atomic_read (&tpd_ring->next_to_use); + first_mapped = next_to_use; buffer_info = &tpd_ring->buffer_info[next_to_use];BUG_ON (buffer_info->skb);/* put skb in last TPD */
@@ -2215,6 +2224,8 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, buffer_info->dma =pci_map_page (adapter->pdev, page, offset, hdr_len,PCI_DMA_TODEVICE ); +if (pci_dma_mapping_error (adapter->pdev, buffer_info->dma)) + goto dma_err;if (++next_to_use == tpd_ring->count) next_to_use =0 ;
@@ -2240,6 +2251,9 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, buffer_info->dma =pci_map_page (adapter->pdev, page, offset, buffer_info->length,PCI_DMA_TODEVICE ); +if (pci_dma_mapping_error (adapter->pdev, + buffer_info->dma)) + goto dma_err;if (++next_to_use == tpd_ring->count) next_to_use =0 ; }
@@ -2251,6 +2265,8 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, offset =offset_in_page (skb->data); buffer_info->dma =pci_map_page (adapter->pdev, page, offset, buf_len,PCI_DMA_TODEVICE ); +if (pci_dma_mapping_error (adapter->pdev, buffer_info->dma)) + goto dma_err;if (++next_to_use == tpd_ring->count) next_to_use =0 ; }
@@ -2274,6 +2290,9 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, buffer_info->dma =skb_frag_dma_map (&adapter->pdev->dev, frag, i *ATL1_MAX_TX_BUF_LEN , buffer_info->length,DMA_TO_DEVICE ); +if (dma_mapping_error (&adapter->pdev->dev, + buffer_info->dma)) + goto dma_err;if (++next_to_use == tpd_ring->count) next_to_use =0 ;
@@ -2282,6 +2301,22 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,/* last tpd's buffer-info */ buffer_info->skb = skb; + +return true; + + dma_err: +while (first_mapped != next_to_use) { + buffer_info = &tpd_ring->buffer_info[first_mapped]; +pci_unmap_page (adapter->pdev, + buffer_info->dma, + buffer_info->length, +PCI_DMA_TODEVICE ); + buffer_info->dma =0 ; + +if (++first_mapped == tpd_ring->count) + first_mapped =0 ; + } +return false; } static void atl1_tx_queue(struct atl1_adapter *adapter, u16 count,
@@ -2352,10 +2387,8 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, len =skb_headlen (skb); -if (unlikely (skb->len <=0 )) { -dev_kfree_skb_any (skb); -return NETDEV_TX_OK ; - } +if (unlikely (skb->len <=0 )) + goto drop_packet; nr_frags =skb_shinfo (skb)->nr_frags;for (f =0 ; f < nr_frags; f++) {
@@ -2369,10 +2402,8 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,if (skb->protocol ==htons (ETH_P_IP )) { proto_hdr_len = (skb_transport_offset (skb) +tcp_hdrlen (skb)); -if (unlikely (proto_hdr_len > len)) { -dev_kfree_skb_any (skb); -return NETDEV_TX_OK ; - } +if (unlikely (proto_hdr_len > len)) + goto drop_packet;/* need additional TPD ? */ if (proto_hdr_len != len) count += (len - proto_hdr_len +
@@ -2404,23 +2435,26 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, } tso =atl1_tso (adapter, skb, ptpd); -if (tso <0 ) { -dev_kfree_skb_any (skb); -return NETDEV_TX_OK ; - } +if (tso <0 ) + goto drop_packet;if (!tso) { ret_val =atl1_tx_csum (adapter, skb, ptpd); -if (ret_val <0 ) { -dev_kfree_skb_any (skb); -return NETDEV_TX_OK ; - } +if (ret_val <0 ) + goto drop_packet; } -atl1_tx_map (adapter, skb, ptpd); +if (!atl1_tx_map (adapter, skb, ptpd)) + goto drop_packet; +atl1_tx_queue (adapter, count, ptpd);atl1_update_mailbox (adapter);return NETDEV_TX_OK ; + +drop_packet: + adapter->soft_stats.tx_errors++; +dev_kfree_skb_any (skb); +return NETDEV_TX_OK ; }static int atl1_rings_clean (struct napi_struct *napi,int budget)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 91/148 dpaa2-eth: fix xdp_rxq_info leak
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fushuai Wang <[email protected]>
[ Upstream commit 2def09ead4ad5907988b655d1e1454003aaf8297 ]
The driver registered xdp_rxq_info structures via xdp_rxq_info_reg() but failed to properly unregister them in error paths and during removal.
--- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +24 -2
@@ -2725,6 +2725,7 @@ static int setup_rx_flow(struct dpaa2_eth_priv *priv, MEM_TYPE_PAGE_ORDER0, NULL);if (err) {dev_err (dev,"xdp_rxq_info_reg_mem_model failed\n" ); +xdp_rxq_info_unreg (&fq->channel->xdp_rxq);return err; }
@@ -3153,17 +3154,25 @@ static int bind_dpni(struct dpaa2_eth_priv *priv)return -EINVAL ; }if (err) -return err; + goto out; } err =dpni_get_qdid (priv->mc_io,0 , priv->mc_token,DPNI_QUEUE_TX , &priv->tx_qdid);if (err) {dev_err (dev,"dpni_get_qdid() failed\n" ); -return err; + goto out; }return 0 ; + +out: +while (i--) { +if (priv->fq[i].type ==DPAA2_RX_FQ && +xdp_rxq_info_is_reg (&priv->fq[i].channel->xdp_rxq)) +xdp_rxq_info_unreg (&priv->fq[i].channel->xdp_rxq); + } +return err; }/* Allocate rings for storing incoming frame descriptors */
@@ -3445,6 +3454,17 @@ static void del_ch_napi(struct dpaa2_eth_priv *priv) } } +static void dpaa2_eth_free_rx_xdp_rxq (struct dpaa2_eth_priv *priv) +{ +int i; + +for (i =0 ; i < priv->num_fqs; i++) { +if (priv->fq[i].type ==DPAA2_RX_FQ && +xdp_rxq_info_is_reg (&priv->fq[i].channel->xdp_rxq)) +xdp_rxq_info_unreg (&priv->fq[i].channel->xdp_rxq); + } +} +static int dpaa2_eth_probe (struct fsl_mc_device *dpni_dev) {struct device *dev;
@@ -3574,6 +3594,7 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)free_percpu (priv->percpu_stats); err_alloc_percpu_stats:del_ch_napi (priv); +dpaa2_eth_free_rx_xdp_rxq (priv); err_bind:free_dpbp (priv); err_dpbp_setup:
@@ -3614,6 +3635,7 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)free_percpu (priv->percpu_extras);del_ch_napi (priv); +dpaa2_eth_free_rx_xdp_rxq (priv);free_dpbp (priv);free_dpio (priv);free_dpni (priv);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 92/148 spi: spi-fsl-dspi: Rename fifo_{read,write} and {tx,cmd}_fifo_write
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 547248fbed23f3cd2f6a5937b44fad60993640c4 ]
These function names are very generic and it is easy to get confused. Rename them after the hardware register that they are accessing.
Stable-dep-of: fa60c094c19b ("spi: spi-fsl-dspi: Clear completion counter before initiating transfer")
--- drivers/spi/spi-fsl-dspi.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/spi/spi-fsl-dspi.c +11 -11
@@ -560,12 +560,12 @@ static void ns_delay_scale(char *psc, char *sc, int delay_ns, } } -static void fifo_write (struct fsl_dspi *dspi) +static void dspi_pushr_write (struct fsl_dspi *dspi) {regmap_write (dspi->regmap,SPI_PUSHR ,dspi_pop_tx_pushr (dspi)); } -static void cmd_fifo_write (struct fsl_dspi *dspi) +static void dspi_pushr_cmd_write (struct fsl_dspi *dspi) {u16 cmd = dspi->tx_cmd;
@@ -574,7 +574,7 @@ static void cmd_fifo_write(struct fsl_dspi *dspi)regmap_write (dspi->regmap_pushr,PUSHR_CMD , cmd); } -static void tx_fifo_write (struct fsl_dspi *dspi,u16 txdata) +static void dspi_pushr_txdata_write (struct fsl_dspi *dspi,u16 txdata) {regmap_write (dspi->regmap_pushr,PUSHR_TX , txdata); }
@@ -590,18 +590,18 @@ static void dspi_tcfq_write(struct fsl_dspi *dspi)*/ u32 data =dspi_pop_tx (dspi); -cmd_fifo_write (dspi); -tx_fifo_write (dspi, data &0xFFFF ); -tx_fifo_write (dspi, data >>16 ); +dspi_pushr_cmd_write (dspi); +dspi_pushr_txdata_write (dspi, data &0xFFFF ); +dspi_pushr_txdata_write (dspi, data >>16 ); }else {/* Write one entry to both TX FIFO and CMD FIFO * simultaneously. */ -fifo_write (dspi); +dspi_pushr_write (dspi); } } -static u32 fifo_read (struct fsl_dspi *dspi) +static u32 dspi_popr_read (struct fsl_dspi *dspi) {u32 rxdata =0 ;
@@ -611,7 +611,7 @@ static u32 fifo_read(struct fsl_dspi *dspi)static void dspi_tcfq_read (struct fsl_dspi *dspi) { -dspi_push_rx (dspi,fifo_read (dspi)); +dspi_push_rx (dspi,dspi_popr_read (dspi)); }static void dspi_eoq_write (struct fsl_dspi *dspi)
@@ -629,7 +629,7 @@ static void dspi_eoq_write(struct fsl_dspi *dspi)if (fifo_size == (DSPI_FIFO_SIZE -1 )) dspi->tx_cmd |=SPI_PUSHR_CMD_CTCNT ;/* Write combined TX FIFO and CMD FIFO entry */ -fifo_write (dspi); +dspi_pushr_write (dspi); } }
@@ -639,7 +639,7 @@ static void dspi_eoq_read(struct fsl_dspi *dspi)/* Read one FIFO entry and push to rx buffer */ while ((dspi->rx < dspi->rx_end) && fifo_size--) -dspi_push_rx (dspi,fifo_read (dspi)); +dspi_push_rx (dspi,dspi_popr_read (dspi)); }static int dspi_rxtx (struct fsl_dspi *dspi)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 93/148 spi: spi-fsl-dspi: Fix interrupt-less DMA mode taking an XSPI code path
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 826b3a6a34619b934cdc33eeb961fcb99ce92c09 ]
Interrupts are not necessary for DMA functionality, since the completion event is provided by the DMA driver.
But if the driver fails to request the IRQ defined in the device tree, it will call dspi_poll which would make the driver hang waiting for data to become available in the RX FIFO.
Stable-dep-of: fa60c094c19b ("spi: spi-fsl-dspi: Clear completion counter before initiating transfer")
--- drivers/spi/spi-fsl-dspi.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/spi/spi-fsl-dspi.c +9 -7
@@ -793,13 +793,15 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr, goto out; } -if (!dspi->irq) { -do { - status =dspi_poll (dspi); - }while (status == -EINPROGRESS ); - }else if (trans_mode !=DSPI_DMA_MODE ) { -wait_for_completion (&dspi->xfer_done); -reinit_completion (&dspi->xfer_done); +if (trans_mode !=DSPI_DMA_MODE ) { +if (dspi->irq) { +wait_for_completion (&dspi->xfer_done); +reinit_completion (&dspi->xfer_done); + }else { +do { + status =dspi_poll (dspi); + }while (status == -EINPROGRESS ); + } }if (transfer->delay_usecs)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 94/148 spi: spi-fsl-dspi: Clear completion counter before initiating transfer
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit fa60c094c19b97e103d653f528f8d9c178b6a5f5 ]
In target mode, extra interrupts can be received between the end of a transfer and halting the module if the host continues sending more data. If the interrupt from this occurs after the reinit_completion() then the completion counter is left at a non-zero value. The next unrelated transfer initiated by userspace will then complete immediately without waiting for the interrupt or writing to the RX buffer.
Fix it by resetting the counter before the transfer so that lingering values are cleared. This is done after clearing the FIFOs and the status register but before the transfer is initiated, so no interrupts should be received at this point resulting in other race conditions.
--- drivers/spi/spi-fsl-dspi.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/spi/spi-fsl-dspi.c +18 -1
@@ -773,10 +773,28 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr, trans_mode = dspi->devtype_data->trans_mode;switch (trans_mode) {case DSPI_EOQ_MODE : +/* +* Reinitialize the completion before transferring data +* to avoid the case where it might remain in the done +* state due to a spurious interrupt from a previous +* transfer. This could falsely signal that the current +* transfer has completed. +*/ +if (dspi->irq) +reinit_completion (&dspi->xfer_done);regmap_write (dspi->regmap,SPI_RSER ,SPI_RSER_EOQFE );dspi_eoq_write (dspi);break ;case DSPI_TCFQ_MODE : +/* +* Reinitialize the completion before transferring data +* to avoid the case where it might remain in the done +* state due to a spurious interrupt from a previous +* transfer. This could falsely signal that the current +* transfer has completed. +*/ +if (dspi->irq) +reinit_completion (&dspi->xfer_done);regmap_write (dspi->regmap,SPI_RSER ,SPI_RSER_TCFQE );dspi_tcfq_write (dspi);break ;
@@ -796,7 +814,6 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,if (trans_mode !=DSPI_DMA_MODE ) {if (dspi->irq) {wait_for_completion (&dspi->xfer_done); -reinit_completion (&dspi->xfer_done); }else { do { status = dspi_poll(dspi);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 95/148 drm/i915/selftests: Change mock_request() to return error pointers
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit caa7c7a76b78ce41d347003f84975125383e6b59 ]
There was an error pointer vs NULL bug in __igt_breadcrumbs_smoketest(). The __mock_request_alloc() function implements the smoketest->request_alloc() function pointer. It was supposed to return error pointers, but it propogates the NULL return from mock_request() so in the event of a failure, it would lead to a NULL pointer dereference.
To fix this, change the mock_request() function to return error pointers and update all the callers to expect that.
--- drivers/gpu/drm/i915/selftests/i915_request.c | 20 ++++++++++--------- drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/selftests/i915_request.c +11 -9
@@ -47,8 +47,10 @@ static int igt_add_request(void *arg)mutex_lock (&i915->drm.struct_mutex); request =mock_request (i915->engine[RCS0 ]->kernel_context,HZ /10 ); -if (!request) +if (IS_ERR (request)) { + err =PTR_ERR (request); goto out_unlock; + }i915_request_add (request);
@@ -69,8 +71,8 @@ static int igt_wait_request(void *arg)mutex_lock (&i915->drm.struct_mutex); request =mock_request (i915->engine[RCS0 ]->kernel_context,T ); -if (!request) { - err = -ENOMEM ; +if (IS_ERR (request)) { + err =PTR_ERR (request); goto out_unlock; }i915_request_get (request);
@@ -142,8 +144,8 @@ static int igt_fence_wait(void *arg)mutex_lock (&i915->drm.struct_mutex); request =mock_request (i915->engine[RCS0 ]->kernel_context,T ); -if (!request) { - err = -ENOMEM ; +if (IS_ERR (request)) { + err =PTR_ERR (request); goto out_locked; }
@@ -203,8 +205,8 @@ static int igt_request_rewind(void *arg)GEM_BUG_ON (IS_ERR (ce)); request =mock_request (ce,2 *HZ );intel_context_put (ce); -if (!request) { - err = -ENOMEM ; +if (IS_ERR (request)) { + err =PTR_ERR (request); goto err_context_0; }
@@ -216,8 +218,8 @@ static int igt_request_rewind(void *arg)GEM_BUG_ON (IS_ERR (ce)); vip =mock_request (ce,0 );intel_context_put (ce); -if (!vip) { - err = -ENOMEM ; +if (IS_ERR (vip)) { + err =PTR_ERR (vip); goto err_context_1; }
drivers/gpu/drm/i915/selftests/mock_request.c +1 -1
@@ -35,7 +35,7 @@ mock_request(struct intel_context *ce, unsigned long delay)/* NB the i915->requests slab cache is enlarged to fit mock_request */ request =intel_context_create_request (ce);if (IS_ERR (request)) -return NULL ; +return request; request->mock.delay = delay;return request;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 69/148 enic: fix incorrect MTU comparison in enic_change_mtu()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit aaf2b2480375099c022a82023e1cd772bf1c6a5d ]
The comparison in enic_change_mtu() incorrectly used the current netdev->mtu instead of the new new_mtu value when warning about an MTU exceeding the port MTU. This could suppress valid warnings or issue incorrect ones.
Fix the condition and log to properly reflect the new_mtu.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cisco/enic/enic_main.c +2 -2
@@ -2093,10 +2093,10 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu)if (enic_is_dynamic (enic) ||enic_is_sriov_vf (enic))return -EOPNOTSUPP ; -if (netdev->mtu > enic->port_mtu) +if (new_mtu > enic->port_mtu)netdev_warn (netdev,"interface MTU (%d) set higher than port MTU (%d)\n" , - netdev->mtu, enic->port_mtu); + new_mtu, enic->port_mtu);return _enic_change_mtu (netdev, new_mtu); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 96/148 drm/i915/gt: Fix timeline left held on VMA alloc error
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Janusz Krzysztofik <[email protected]>
[ Upstream commit a5aa7bc1fca78c7fa127d9e33aa94a0c9066c1d6 ]
The following error has been reported sporadically by CI when a test unbinds the i915 driver on a ring submission platform:
<4> [239.330153] ------------[ cut here ]------------
<4> [239.330166] i915 0000:00:02.0: [drm] drm_WARN_ON(dev_priv->mm.shrink_count)
<4> [239.330196] WARNING: CPU: 1 PID: 18570 at drivers/gpu/drm/i915/i915_gem.c:1309 i915_gem_cleanup_early+0x13e/0x150 [i915]
...
<4> [239.330640] RIP: 0010:i915_gem_cleanup_early+0x13e/0x150 [i915]
...
<4> [239.330942] Call Trace:
<4> [239.330944] <TASK> <4> [239.330949] i915_driver_late_release+0x2b/0xa0 [i915] <4> [239.331202] i915_driver_release+0x86/0xa0 [i915] <4> [239.331482] devm_drm_dev_init_release+0x61/0x90 <4> [239.331494] devm_action_release+0x15/0x30 <4> [239.331504] release_nodes+0x3d/0x120 <4> [239.331517] devres_release_all+0x96/0xd0 <4> [239.331533] device_unbind_cleanup+0x12/0x80 <4> [239.331543] device_release_driver_internal+0x23a/0x280 <4> [239.331550] ? bus_find_device+0xa5/0xe0 <4> [239.331563] device_driver_detach+0x14/0x20
...
<4> [357.719679] ---[ end trace 0000000000000000 ]---
If the test also unloads the i915 module then that's followed with:
<3> [357.787478] =============================================================================
<3> [357.788006] BUG i915_vma (Tainted: G U W N ): Objects remaining on __kmem_cache_shutdown()
<3> [357.788031] ----------------------------------------------------------------------------- <3> [357.788204] Object 0xffff888109e7f480 @offset=29824
<3> [357.788670] Allocated in i915_vma_instance+0xee/0xc10 [i915] age=292729 cpu=4 pid=2244
<4> [357.788994] i915_vma_instance+0xee/0xc10 [i915] <4> [357.789290] init_status_page+0x7b/0x420 [i915] <4> [357.789532] intel_engines_init+0x1d8/0x980 [i915] <4> [357.789772] intel_gt_init+0x175/0x450 [i915] <4> [357.790014] i915_gem_init+0x113/0x340 [i915] <4> [357.790281] i915_driver_probe+0x847/0xed0 [i915] <4> [357.790504] i915_pci_probe+0xe6/0x220 [i915]
...
Closer analysis of CI results history has revealed a dependency of the error on a few IGT tests, namely:
- igt@api_intel_allocator@fork-simple-stress-signal,
- igt@api_intel_allocator@two-level-inception-interruptible,
- igt@gem_linear_blits@interruptible,
- igt@prime_mmap_coherency@ioctl-errors,
which invisibly trigger the issue, then exhibited with first driver unbind attempt.
All of the above tests perform actions which are actively interrupted with signals. Further debugging has allowed to narrow that scope down to DRM_IOCTL_I915_GEM_EXECBUFFER2, and ring_context_alloc(), specific to ring submission, in particular.
If successful then that function, or its execlists or GuC submission equivalent, is supposed to be called only once per GEM context engine, followed by raise of a flag that prevents the function from being called again. The function is expected to unwind its internal errors itself, so it may be safely called once more after it returns an error.
In case of ring submission, the function first gets a reference to the engine's legacy timeline and then allocates a VMA. If the VMA allocation fails, e.g. when i915_vma_instance() called from inside is interrupted with a signal, then ring_context_alloc() fails, leaving the timeline held referenced. On next I915_GEM_EXECBUFFER2 IOCTL, another reference to the timeline is got, and only that last one is put on successful completion. As a consequence, the legacy timeline, with its underlying engine status page's VMA object, is still held and not released on driver unbind.
Get the legacy timeline only after successful allocation of the context engine's VMA.
v2: Add a note on other submission methods (Krzysztof Karas):
Both execlists and GuC submission use lrc_alloc() which seems free from a similar issue.
--- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +2 -1
@@ -1475,7 +1475,6 @@ static int ring_context_alloc(struct intel_context *ce)/* One ringbuffer to rule them all */ GEM_BUG_ON (!engine->legacy.ring); ce->ring = engine->legacy.ring; - ce->timeline =intel_timeline_get (engine->legacy.timeline);GEM_BUG_ON (ce->state);if (engine->context_size) {
@@ -1488,6 +1487,8 @@ static int ring_context_alloc(struct intel_context *ce) ce->state = vma; } + ce->timeline =intel_timeline_get (engine->legacy.timeline); +return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 97/148 net: rose: Fix fall-through warnings for Clang
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 90d181ca488f466904ea59dd5c836f766b69c71b ]
In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple warnings by explicitly adding multiple break statements instead of letting the code fall through to the next case.
Stable-dep-of: 34a500caf48c ("rose: fix dangling neighbour pointers in rose_rt_device_down()")
--- net/rose/rose_route.c | 2 ++ 1 file changed, 2 insertions(+)
net/rose/rose_route.c +2 -0
@@ -347,6 +347,7 @@ static int rose_del_node(struct rose_route_struct *rose_route,case 1 : rose_node->neighbour[1 ] = rose_node->neighbour[2 ]; +break ;case 2 :break ; }
@@ -508,6 +509,7 @@ void rose_rt_device_down(struct net_device *dev)/* fall through */ case 1 : t->neighbour[1 ] = t->neighbour[2 ]; +break ;case 2 :break ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 98/148 rose: fix dangling neighbour pointers in rose_rt_device_down()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kohei Enju <[email protected]>
[ Upstream commit 34a500caf48c47d5171f4aa1f237da39b07c6157 ]
There are two bugs in rose_rt_device_down() that can cause use-after-free:
1. The loop bound t->count is modified within the loop, which can cause the loop to terminate early and miss some entries.
2. When removing an entry from the neighbour array, the subsequent entries are moved up to fill the gap, but the loop index i is still incremented, causing the next entry to be skipped.
For example, if a node has three neighbours (A, A, B) with count=3 and A is being removed, the second A is not checked.
i=0: (A, A, B) -> (A, B) with count=2
^ checked
i=1: (A, B) -> (A, B) with count=2
^ checked (B, not A!)
i=2: (doesn't occur because i < count is false)
This leaves the second A in the array with count=2, but the rose_neigh structure has been freed. Code that accesses these entries assumes that the first count entries are valid pointers, causing a use-after-free when it accesses the dangling pointer.
Fix both issues by iterating over the array in reverse order with a fixed loop bound. This ensures that all entries are examined and that the removal of an entry doesn't affect subsequent iterations.
--- net/rose/rose_route.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
net/rose/rose_route.c +4 -11
@@ -497,22 +497,15 @@ void rose_rt_device_down(struct net_device *dev) t = rose_node; rose_node = rose_node->next; -for (i =0 ; i < t->count; i++) { +for (i = t->count -1 ; i >=0 ; i--) {if (t->neighbour[i] != s)continue ; t->count--; -switch (i) { -case 0 : - t->neighbour[0 ] = t->neighbour[1 ]; -/* fall through */ -case 1 : - t->neighbour[1 ] = t->neighbour[2 ]; -break ; -case 2 : -break ; - } +memmove (&t->neighbour[i], &t->neighbour[i +1 ], +sizeof (t->neighbour[0 ]) * + (t->count - i)); }if (t->count <=0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 99/148 Logitech C-270 even more broken
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit cee4392a57e14a799fbdee193bc4c0de65b29521 upstream.
Some varieties of this device don't work withRESET_RESUME alone.
--- drivers/usb/core/quirks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/quirks.c +2 -1
@@ -224,7 +224,8 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME }, /* Logitech HD Webcam C270 */ - { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME | + USB_QUIRK_NO_LPM}, /* Logitech HD Pro Webcams C920, C920-C, C922, C925e and C930e */ { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT },
Greg Kroah-Hartman
maintainerPATCH 70/148 nui: Fix dma_mapping_error() check
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 561aa0e22b70a5e7246b73d62a824b3aef3fc375 ]
dma_map_XXX() functions return values DMA_MAPPING_ERROR as error values which is often ~0. The error value should be tested with dma_mapping_error().
This patch creates a new function in niu_ops to test if the mapping failed. The test is fixed in niu_rbr_add_page(), added in niu_start_xmit() and the successfully mapped pages are unmaped upon error.
--- drivers/net/ethernet/sun/niu.c | 31 ++++++++++++++++++++++++++++++- drivers/net/ethernet/sun/niu.h | 4 ++++ 2 files changed, 34 insertions(+), 1 deletion(-)
drivers/net/ethernet/sun/niu.c +30 -1
@@ -3317,7 +3317,7 @@ static int niu_rbr_add_page(struct niu *np, struct rx_ring_info *rp, addr = np->ops->map_page (np->device, page,0 ,PAGE_SIZE ,DMA_FROM_DEVICE ); -if (!addr) { +if (np->ops->mapping_error (np->device, addr)) {__free_page (page);return -ENOMEM ; }
@@ -6654,6 +6654,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, len =skb_headlen (skb); mapping = np->ops->map_single (np->device, skb->data, len,DMA_TO_DEVICE ); +if (np->ops->mapping_error (np->device, mapping)) + goto out_drop; prod = rp->prod;
@@ -6695,6 +6697,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, mapping = np->ops->map_page (np->device,skb_frag_page (frag),skb_frag_off (frag), len,DMA_TO_DEVICE ); +if (np->ops->mapping_error (np->device, mapping)) + goto out_unmap; rp->tx_buffs[prod].skb =NULL ; rp->tx_buffs[prod].mapping = mapping;
@@ -6719,6 +6723,19 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, out:return NETDEV_TX_OK ; +out_unmap: +while (i--) { +const skb_frag_t *frag; + + prod =PREVIOUS_TX (rp, prod); + frag = &skb_shinfo (skb)->frags[i]; + np->ops->unmap_page (np->device, rp->tx_buffs[prod].mapping, +skb_frag_size (frag),DMA_TO_DEVICE ); + } + + np->ops->unmap_single (np->device, rp->tx_buffs[rp->prod].mapping, +skb_headlen (skb),DMA_TO_DEVICE ); + out_drop: rp->tx_errors++;kfree_skb (skb);
@@ -9612,6 +9629,11 @@ static void niu_pci_unmap_single(struct device *dev, u64 dma_address,dma_unmap_single (dev, dma_address, size, direction); } +static int niu_pci_mapping_error (struct device *dev,u64 addr) +{ +return dma_mapping_error (dev, addr); +} +static const struct niu_ops niu_pci_ops = { .alloc_coherent = niu_pci_alloc_coherent, .free_coherent = niu_pci_free_coherent,
@@ -9619,6 +9641,7 @@ static const struct niu_ops niu_pci_ops = { .unmap_page = niu_pci_unmap_page, .map_single = niu_pci_map_single, .unmap_single = niu_pci_unmap_single, + .mapping_error = niu_pci_mapping_error, };static void niu_driver_version (void )
@@ -9996,6 +10019,11 @@ static void niu_phys_unmap_single(struct device *dev, u64 dma_address,/* Nothing to do. */ } +static int niu_phys_mapping_error (struct device *dev,u64 dma_address) +{ +return false; +} +static const struct niu_ops niu_phys_ops = { .alloc_coherent = niu_phys_alloc_coherent, .free_coherent = niu_phys_free_coherent,
@@ -10003,6 +10031,7 @@ static const struct niu_ops niu_phys_ops = { .unmap_page = niu_phys_unmap_page, .map_single = niu_phys_map_single, .unmap_single = niu_phys_unmap_single, + .mapping_error = niu_phys_mapping_error, };static int niu_of_probe (struct platform_device *op)
drivers/net/ethernet/sun/niu.h +4 -0
@@ -2879,6 +2879,9 @@ struct tx_ring_info {#define NEXT_TX (tp, index) \ (((index) + 1) < (tp)->pending ? ((index) + 1) : 0) +#define PREVIOUS_TX (tp, index) \ + (((index) - 1) >= 0 ? ((index) - 1) : (((tp)->pending) - 1)) +static inline u32 niu_tx_avail (struct tx_ring_info *tp) { return (tp->pending -
@@ -3140,6 +3143,7 @@ struct niu_ops { enum dma_data_direction direction);void (*unmap_single)(struct device *dev,u64 dma_address,size_t size,enum dma_data_direction direction); +int (*mapping_error)(struct device *dev,u64 dma_address); };struct niu_link_config {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 71/148 net/sched: Always pass notifications when child class becomes empty
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lion Ackermann <[email protected]>
[ Upstream commit 103406b38c600fec1fe375a77b27d87e314aea09 ]
Certain classful qdiscs may invoke their classes' dequeue handler on an enqueue operation. This may unexpectedly empty the child qdisc and thus make an in-flight class passive via qlen_notify(). Most qdiscs do not expect such behaviour at this point in time and may re-activate the class eventually anyways which will lead to a use-after-free.
The referenced fix commit attempted to fix this behavior for the HFSC case by moving the backlog accounting around, though this turned out to be incomplete since the parent's parent may run into the issue too. The following reproducer demonstrates this use-after-free:
tc qdisc add dev lo root handle 1: drr
tc filter add dev lo parent 1: basic classid 1:1
tc class add dev lo parent 1: classid 1:1 drr
tc qdisc add dev lo parent 1:1 handle 2: hfsc def 1 tc class add dev lo parent 2: classid 2:1 hfsc rt m1 8 d 1 m2 0 tc qdisc add dev lo parent 2:1 handle 3: netem
tc qdisc add dev lo parent 3:1 handle 4: blackhole
echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 tc class delete dev lo classid 1:1
echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888
Since backlog accounting issues leading to a use-after-frees on stale class pointers is a recurring pattern at this point, this patch takes a different approach. Instead of trying to fix the accounting, the patch ensures that qdisc_tree_reduce_backlog always calls qlen_notify when the child qdisc is empty. This solves the problem because deletion of qdiscs always involves a call to qdisc_reset() and / or qdisc_purge_queue() which ultimately resets its qlen to 0 thus causing the following qdisc_tree_reduce_backlog() to report to the parent. Note that this may call qlen_notify on passive classes multiple times. This is not a problem after the recent patch series that made all the classful qdiscs qlen_notify() handlers idempotent.
--- net/sched/sch_api.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
net/sched/sch_api.c +5 -14
@@ -758,15 +758,12 @@ static u32 qdisc_alloc_handle(struct net_device *dev)void qdisc_tree_reduce_backlog (struct Qdisc *sch,int n,int len) { -bool qdisc_is_offloaded = sch->flags &TCQ_F_OFFLOADED ;const struct Qdisc_class_ops *cops;unsigned long cl;u32 parentid;bool notify;int drops; -if (n ==0 && len ==0 ) -return ; drops =max_t (int, n,0 );rcu_read_lock ();while ((parentid = sch->parent)) {
@@ -775,17 +772,8 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)if (sch->flags &TCQ_F_NOPARENT )break ; -/* Notify parent qdisc only if child qdisc becomes empty. -* -* If child was empty even before update then backlog -* counter is screwed and we skip notification because -* parent class is already passive. -* -* If the original child was offloaded then it is allowed -* to be seem as empty, so the parent is notified anyway. -*/ - notify = !sch->q.qlen && !WARN_ON_ONCE (!n && - !qdisc_is_offloaded); +/* Notify parent qdisc only if child qdisc becomes empty. */ + notify = !sch->q.qlen;/* TODO: perform the search on a per txq basis */ sch =qdisc_lookup (qdisc_dev (sch),TC_H_MAJ (parentid));if (sch ==NULL ) {
@@ -794,6 +782,9 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len) } cops = sch->ops->cl_ops;if (notify && cops->qlen_notify) { +/* Note that qlen_notify must be idempotent as it may get called +* multiple times. +*/ cl = cops->find (sch, parentid); cops->qlen_notify (sch, cl); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 72/148 ALSA: sb: Force to disable DMAs once when DMA mode is changed
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 4c267ae2ef349639b4d9ebf00dd28586a82fdbe6 ]
When the DMA mode is changed on the (still real!) SB AWE32 after playing a stream and closing, the previous DMA setup was still silently kept, and it can confuse the hardware, resulting in the unexpected noises. As a workaround, enforce the disablement of DMA setups when the DMA setup is changed by the kcontrol.
https://bugzilla.kernel.org/show_bug.cgi?id=218185
--- sound/isa/sb/sb16_main.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/isa/sb/sb16_main.c +4 -0
@@ -722,6 +722,10 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct change = nval != oval;snd_sb16_set_dma_mode (chip, nval);spin_unlock_irqrestore (&chip->reg_lock, flags); +if (change) { +snd_dma_disable (chip->dma8); +snd_dma_disable (chip->dma16); + }return change; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 73/148 ata: pata_cs5536: fix build on 32-bit UML
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit fe5b391fc56f77cf3c22a9dd4f0ce20db0e3533f ]
On 32-bit ARCH=um, CONFIG_X86_32 is still defined, so it doesn't indicate building on real X86 machines. There's no MSR on UML though, so add a check for CONFIG_X86.
--- drivers/ata/pata_cs5536.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/pata_cs5536.c +1 -1
@@ -27,7 +27,7 @@#include <scsi/scsi_host.h> #include <linux/dmi.h> -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86 ) && defined(CONFIG_X86_32 )#include <asm/msr.h> static int use_msr;module_param_named (msr, use_msr, int,0644 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 74/148 powerpc: Fix struct termio related ioctl macros
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Madhavan Srinivasan <[email protected]>
[ Upstream commit ab107276607af90b13a5994997e19b7b9731e251 ]
Since termio interface is now obsolete, include/uapi/asm/ioctls.h has some constant macros referring to "struct termio", this caused build failure at userspace.
In file included from /usr/include/asm/ioctl.h:12,
from /usr/include/asm/ioctls.h:5,
from tst-ioctls.c:3:tst-ioctls.c: In function 'get_TCGETA':
tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio'
12 | return TCGETA;
| ^~~~~~Even though termios.h provides "struct termio", trying to juggle definitions around to make it compile could introduce regressions. So better to open code it.
--- arch/powerpc/include/uapi/asm/ioctls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/include/uapi/asm/ioctls.h +4 -4
@@ -23,10 +23,10 @@#define TCSETSW _IOW('t', 21, struct termios)#define TCSETSF _IOW('t', 22, struct termios) -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x40147417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x80147418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x80147419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x8014741c/* _IOW('t', 28, struct termio) */ #define TCSBRK _IO('t', 29)#define TCXONC _IO('t', 30)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 75/148 wifi: mac80211: drop invalid source address OCB frames
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit d1b1a5eb27c4948e8811cf4dbb05aaf3eb10700c ]
In OCB, don't accept frames from invalid source addresses (and in particular don't try to create stations for them), drop the frames instead.
--- net/mac80211/rx.c | 4 ++++ 1 file changed, 4 insertions(+)
net/mac80211/rx.c +4 -0
@@ -3982,6 +3982,10 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)if (!multicast && !ether_addr_equal (sdata->dev->dev_addr, hdr->addr1))return false; +/* reject invalid/our STA address */ +if (!is_valid_ether_addr (hdr->addr2) || +ether_addr_equal (sdata->dev->dev_addr, hdr->addr2)) +return false;if (!rx->sta) {int rate_idx;if (status->encoding !=RX_ENC_LEGACY )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 66/148 drm/exynos: fimd: Guard display clock control with runtime PM calls
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit 5d91394f236167ac624b823820faf4aa928b889e ]
Commit c9b1150a68d9 ("drm/atomic-helper: Re-order bridge chain pre-enable and post-disable") changed the call sequence to the CRTC enable/disable and bridge pre_enable/post_disable methods, so those bridge methods are now called when CRTC is not yet enabled.
This causes a lockup observed on Samsung Peach-Pit/Pi Chromebooks. The source of this lockup is a call to fimd_dp_clock_enable() function, when FIMD device is not yet runtime resumed. It worked before the mentioned commit only because the CRTC implemented by the FIMD driver was always enabled what guaranteed the FIMD device to be runtime resumed.
This patch adds runtime PM guards to the fimd_dp_clock_enable() function to enable its proper operation also when the CRTC implemented by FIMD is not yet enabled.
--- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/exynos/exynos_drm_fimd.c +12 -0
@@ -182,6 +182,7 @@ struct fimd_context {u32 i80ifcon;bool i80_if;bool suspended; +bool dp_clk_enabled;wait_queue_head_t wait_vsync_queue;atomic_t wait_vsync_event;atomic_t win_updated;
@@ -1003,7 +1004,18 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable) struct fimd_context *ctx = container_of(clk, struct fimd_context, dp_clk);u32 val = enable ?DP_MIE_CLK_DP_ENABLE :DP_MIE_CLK_DISABLE ; + +if (enable == ctx->dp_clk_enabled) +return ; + +if (enable) +pm_runtime_resume_and_get (ctx->dev); + + ctx->dp_clk_enabled = enable;writel (val, ctx->regs +DP_MIE_CLKCON ); + +if (!enable) +pm_runtime_put (ctx->dev); }static const struct exynos_drm_crtc_ops fimd_crtc_ops = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 101/148 ACPI: PAD: fix crash in exit_round_robin()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seiji Nishikawa <[email protected]>
commit 0a2ed70a549e61c5181bad5db418d223b68ae932 upstream.
The kernel occasionally crashes in cpumask_clear_cpu(), which is called within exit_round_robin(), because when executing clear_bit(nr, addr) with nr set to 0xffffffff, the address calculation may cause misalignment within the memory, leading to access to an invalid memory address.
----------
BUG: unable to handle kernel paging request at ffffffffe0740618
...
CPU: 3 PID: 2919323 Comm: acpi_pad/14 Kdump: loaded Tainted: G OE X --------- - - 4.18.0-425.19.2.el8_7.x86_64 #1
...
RIP: 0010:power_saving_thread+0x313/0x411 [acpi_pad]
Code: 89 cd 48 89 d3 eb d1 48 c7 c7 55 70 72 c0 e8 64 86 b0 e4 c6 05 0d a1 02 00 01 e9 bc fd ff ff 45 89 e4 42 8b 04 a5 20 82 72 c0 <f0> 48 0f b3 05 f4 9c 01 00 42 c7 04 a5 20 82 72 c0 ff ff ff ff 31
RSP: 0018:ff72a5d51fa77ec8 EFLAGS: 00010202
RAX: 00000000ffffffff RBX: ff462981e5d8cb80 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 0000000000000246 RDI: 0000000000000246
RBP: ff46297556959d80 R08: 0000000000000382 R09: ff46297c8d0f38d8
R10: 0000000000000000 R11: 0000000000000001 R12: 000000000000000e
R13: 0000000000000000 R14: ffffffffffffffff R15: 000000000000000e
FS: 0000000000000000(0000) GS:ff46297a800c0000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: ffffffffe0740618 CR3: 0000007e20410004 CR4: 0000000000771ee0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
PKRU: 55555554
Call Trace:
? acpi_pad_add+0x120/0x120 [acpi_pad]
kthread+0x10b/0x130
? set_kthread_struct+0x50/0x50
ret_from_fork+0x1f/0x40
...CR2: ffffffffe0740618
crash> dis -lr ffffffffc0726923
...
/usr/src/debug/kernel-4.18.0-425.19.2.el8_7/linux-4.18.0-425.19.2.el8_7.x86_64/./include/linux/cpumask.h: 1140xffffffffc0726918 <power_saving_thread+776>: mov %r12d,%r12d/usr/src/debug/kernel-4.18.0-425.19.2.el8_7/linux-4.18.0-425.19.2.el8_7.x86_64/./include/linux/cpumask.h: 3250xffffffffc072691b <power_saving_thread+779>: mov -0x3f8d7de0(,%r12,4),%eax/usr/src/debug/kernel-4.18.0-425.19.2.el8_7/linux-4.18.0-425.19.2.el8_7.x86_64/./arch/x86/include/asm/bitops.h: 800xffffffffc0726923 <power_saving_thread+787>: lock btr %rax,0x19cf4(%rip) # 0xffffffffc0740620 <pad_busy_cpus_bits>
crash> px tsk_in_cpu[14]
$66 = 0xffffffff
crash> px 0xffffffffc072692c+0x19cf4
$99 = 0xffffffffc0740620
crash> sym 0xffffffffc0740620 ffffffffc0740620 (b) pad_busy_cpus_bits [acpi_pad]
crash> px pad_busy_cpus_bits[0]
$42 = 0xfffc0
----------
To fix this, ensure that tsk_in_cpu[tsk_index] != -1 before calling cpumask_clear_cpu() in exit_round_robin(), just as it is done in round_robin_cpu().
--- drivers/acpi/acpi_pad.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/acpi/acpi_pad.c +5 -2
@@ -128,8 +128,11 @@ static void round_robin_cpu(unsigned intstatic void exit_round_robin (unsigned int tsk_index) {struct cpumask *pad_busy_cpus =to_cpumask (pad_busy_cpus_bits); -cpumask_clear_cpu (tsk_in_cpu[tsk_index], pad_busy_cpus); - tsk_in_cpu[tsk_index] =-1 ; + +if (tsk_in_cpu[tsk_index] !=-1 ) { +cpumask_clear_cpu (tsk_in_cpu[tsk_index], pad_busy_cpus); + tsk_in_cpu[tsk_index] =-1 ; + } }static unsigned int idle_pct =5 ;/* percentage */
Greg Kroah-Hartman
maintainerPATCH 110/148 tipc: Fix use-after-free in tipc_conn_close().
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 667eeab4999e981c96b447a4df5f20bdf5c26f13 ]
syzbot reported a null-ptr-deref in tipc_conn_close() during netns dismantle. [0]
tipc_topsrv_stop() iterates tipc_net(net)->topsrv->conn_idr and calls tipc_conn_close() for each tipc_conn.
The problem is that tipc_conn_close() is called after releasing the IDR lock.
At the same time, there might be tipc_conn_recv_work() running and it could call tipc_conn_close() for the same tipc_conn and release its last ->kref.
Once we release the IDR lock in tipc_topsrv_stop(), there is no guarantee that the tipc_conn is alive.
Let's hold the ref before releasing the lock and put the ref after tipc_conn_close() in tipc_topsrv_stop().
[0]:
BUG: KASAN: use-after-free in tipc_conn_close+0x122/0x140 net/tipc/topsrv.c:165
Read of size 8 at addr ffff888099305a08 by task kworker/u4:3/435
CPU: 0 PID: 435 Comm: kworker/u4:3 Not tainted 4.19.204-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Workqueue: netns cleanup_net
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x1fc/0x2ef lib/dump_stack.c:118
print_address_description.cold+0x54/0x219 mm/kasan/report.c:256
kasan_report_error.cold+0x8a/0x1b9 mm/kasan/report.c:354
kasan_report mm/kasan/report.c:412 [inline]
__asan_report_load8_noabort+0x88/0x90 mm/kasan/report.c:433
tipc_conn_close+0x122/0x140 net/tipc/topsrv.c:165
tipc_topsrv_stop net/tipc/topsrv.c:701 [inline]
tipc_topsrv_exit_net+0x27b/0x5c0 net/tipc/topsrv.c:722
ops_exit_list+0xa5/0x150 net/core/net_namespace.c:153
cleanup_net+0x3b4/0x8b0 net/core/net_namespace.c:553
process_one_work+0x864/0x1570 kernel/workqueue.c:2153
worker_thread+0x64c/0x1130 kernel/workqueue.c:2296
kthread+0x33f/0x460 kernel/kthread.c:259
ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:415
Allocated by task 23:
kmem_cache_alloc_trace+0x12f/0x380 mm/slab.c:3625
kmalloc include/linux/slab.h:515 [inline]
kzalloc include/linux/slab.h:709 [inline]
tipc_conn_alloc+0x43/0x4f0 net/tipc/topsrv.c:192
tipc_topsrv_accept+0x1b5/0x280 net/tipc/topsrv.c:470
process_one_work+0x864/0x1570 kernel/workqueue.c:2153
worker_thread+0x64c/0x1130 kernel/workqueue.c:2296
kthread+0x33f/0x460 kernel/kthread.c:259
ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:415
Freed by task 23:
__cache_free mm/slab.c:3503 [inline]
kfree+0xcc/0x210 mm/slab.c:3822
tipc_conn_kref_release net/tipc/topsrv.c:150 [inline]
kref_put include/linux/kref.h:70 [inline]
conn_put+0x2cd/0x3a0 net/tipc/topsrv.c:155
process_one_work+0x864/0x1570 kernel/workqueue.c:2153
worker_thread+0x64c/0x1130 kernel/workqueue.c:2296
kthread+0x33f/0x460 kernel/kthread.c:259
ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:415
The buggy address belongs to the object at ffff888099305a00
which belongs to the cache kmalloc-512 of size 512
The buggy address is located 8 bytes inside of
512-byte region [ffff888099305a00, ffff888099305c00)
The buggy address belongs to the page:
page:ffffea000264c140 count:1 mapcount:0 mapping:ffff88813bff0940 index:0x0
flags: 0xfff00000000100(slab)
raw: 00fff00000000100 ffffea00028b6b88 ffffea0002cd2b08 ffff88813bff0940
raw: 0000000000000000 ffff888099305000 0000000100000006 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888099305900: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888099305980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffff888099305a00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888099305a80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888099305b00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- net/tipc/topsrv.c | 2 ++ 1 file changed, 2 insertions(+)
net/tipc/topsrv.c +2 -0
@@ -699,8 +699,10 @@ static void tipc_topsrv_stop(struct net *net)for (id =0 ; srv->idr_in_use; id++) { con =idr_find (&srv->conn_idr, id);if (con) { +conn_get (con);spin_unlock_bh (&srv->idr_lock);tipc_conn_close (con); +conn_put (con);spin_lock_bh (&srv->idr_lock); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 111/148 atm: clip: Fix potential null-ptr-deref in to_atmarpd().
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 706cc36477139c1616a9b2b96610a8bb520b7119 ]
atmarpd is protected by RTNL since commit f3a0592b37b8 ("[ATM]: clip causes unregister hang").
However, it is not enough because to_atmarpd() is called without RTNL, especially clip_neigh_solicit() / neigh_ops->solicit() is unsleepable.
Also, there is no RTNL dependency around atmarpd.
Let's use a private mutex and RCU to protect access to atmarpd in to_atmarpd().
--- net/atm/clip.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-)
net/atm/clip.c +29 -15
@@ -45,7 +45,8 @@#include <net/atmclip.h> static struct net_device *clip_devs; -static struct atm_vcc *atmarpd; +static struct atm_vcc __rcu *atmarpd; +static DEFINE_MUTEX (atmarpd_lock);static struct timer_list idle_timer;static const struct neigh_ops clip_neigh_ops;
@@ -53,24 +54,35 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip) {struct sock *sk;struct atmarp_ctrl *ctrl; +struct atm_vcc *vcc;struct sk_buff *skb; +int err =0 ;pr_debug ("(%d)\n" , type); -if (!atmarpd) -return -EUNATCH ; + +rcu_read_lock (); + vcc =rcu_dereference (atmarpd); +if (!vcc) { + err = -EUNATCH ; + goto unlock; + } skb =alloc_skb (sizeof (struct atmarp_ctrl ),GFP_ATOMIC ); -if (!skb) -return -ENOMEM ; +if (!skb) { + err = -ENOMEM ; + goto unlock; + } ctrl =skb_put (skb,sizeof (struct atmarp_ctrl )); ctrl->type = type; ctrl->itf_num = itf; ctrl->ip = ip; -atm_force_charge (atmarpd, skb->truesize); +atm_force_charge (vcc, skb->truesize); - sk =sk_atm (atmarpd); + sk =sk_atm (vcc);skb_queue_tail (&sk->sk_receive_queue, skb); sk->sk_data_ready (sk); -return 0 ; +unlock: +rcu_read_unlock (); +return err; }static void link_vcc (struct clip_vcc *clip_vcc,struct atmarp_entry *entry)
@@ -608,10 +620,12 @@ static void atmarpd_close(struct atm_vcc *vcc) {pr_debug ("\n" ); -rtnl_lock (); - atmarpd =NULL ; +mutex_lock (&atmarpd_lock); +RCU_INIT_POINTER (atmarpd,NULL ); +mutex_unlock (&atmarpd_lock); + +synchronize_rcu ();skb_queue_purge (&sk_atm (vcc)->sk_receive_queue); -rtnl_unlock ();pr_debug ("(done)\n" );module_put (THIS_MODULE );
@@ -632,15 +646,15 @@ static struct atm_dev atmarpd_dev = {static int atm_init_atmarp (struct atm_vcc *vcc) { -rtnl_lock (); +mutex_lock (&atmarpd_lock);if (atmarpd) { -rtnl_unlock (); +mutex_unlock (&atmarpd_lock);return -EADDRINUSE ; }mod_timer (&idle_timer, jiffies +CLIP_CHECK_INTERVAL *HZ ); - atmarpd = vcc; +rcu_assign_pointer (atmarpd, vcc);set_bit (ATM_VF_META , &vcc->flags);set_bit (ATM_VF_READY , &vcc->flags);/* allow replies and avoid getting closed if signaling dies */
@@ -649,7 +663,7 @@ static int atm_init_atmarp(struct atm_vcc *vcc) vcc->push =NULL ; vcc->pop =NULL ;/* crash */ vcc->push_oam =NULL ;/* crash */ -rtnl_unlock (); +mutex_unlock (&atmarpd_lock);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 112/148 atm: clip: Fix memory leak of struct clip_vcc.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 62dba28275a9a3104d4e33595c7b3328d4032d8d ]
ioctl(ATMARP_MKIP) allocates struct clip_vcc and set it to vcc->user_back.
The code assumes that vcc_destroy_socket() passes NULL skb to vcc->push() when the socket is close()d, and then clip_push() frees clip_vcc.
However, ioctl(ATMARPD_CTRL) sets NULL to vcc->push() in atm_init_atmarp(), resulting in memory leak.
Let's serialise two ioctl() by lock_sock() and check vcc->push() in atm_init_atmarp() to prevent memleak.
--- net/atm/clip.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/atm/clip.c +8 -0
@@ -646,6 +646,9 @@ static struct atm_dev atmarpd_dev = {static int atm_init_atmarp (struct atm_vcc *vcc) { +if (vcc->push == clip_push) +return -EINVAL ; +mutex_lock (&atmarpd_lock);if (atmarpd) {mutex_unlock (&atmarpd_lock);
@@ -670,6 +673,7 @@ static int atm_init_atmarp(struct atm_vcc *vcc)static int clip_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg) {struct atm_vcc *vcc =ATM_SD (sock); +struct sock *sk = sock->sk;int err =0 ;switch (cmd) {
@@ -690,14 +694,18 @@ static int clip_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) err =clip_create (arg);break ;case ATMARPD_CTRL : +lock_sock (sk); err =atm_init_atmarp (vcc);if (!err) { sock->state =SS_CONNECTED ;__module_get (THIS_MODULE ); } +release_sock (sk);break ;case ATMARP_MKIP : +lock_sock (sk); err =clip_mkip (vcc, arg); +release_sock (sk);break ;case ATMARP_SETENTRY : err =clip_setentry (vcc, (__force __be32 )arg);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 113/148 atm: clip: Fix infinite recursive call of clip_push().
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit c489f3283dbfc0f3c00c312149cae90d27552c45 ]
syzbot reported the splat below. [0]
This happens if we call ioctl(ATMARP_MKIP) more than once.
During the first call, clip_mkip() sets clip_push() to vcc->push(), and the second call copies it to clip_vcc->old_push().
Later, when the socket is close()d, vcc_destroy_socket() passes NULL skb to clip_push(), which calls clip_vcc->old_push(), triggering the infinite recursion.
Let's prevent the second ioctl(ATMARP_MKIP) by checking vcc->user_back, which is allocated by the first call as clip_vcc.
Note also that we use lock_sock() to prevent racy calls.
[0]:
BUG: TASK stack guard page was hit at ffffc9000d66fff8 (stack is ffffc9000d670000..ffffc9000d678000) Oops: stack guard page: 0000 [#1] SMP KASAN NOPTI CPU: 0 UID: 0 PID: 5322 Comm: syz.0.0 Not tainted 6.16.0-rc4-syzkaller #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 RIP: 0010:clip_push+0x5/0x720 net/atm/clip.c:191 Code: e0 8f aa 8c e8 1c ad 5b fa eb ae 66 2e 0f 1f 84 00 00 00 00 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 f3 0f 1e fa 55 <41> 57 41 56 41 55 41 54 53 48 83 ec 20 48 89 f3 49 89 fd 48 bd 00 RSP: 0018:ffffc9000d670000 EFLAGS: 00010246 RAX: 1ffff1100235a4a5 RBX: ffff888011ad2508 RCX: ffff8880003c0000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888037f01000 RBP: dffffc0000000000 R08: ffffffff8fa104f7 R09: 1ffffffff1f4209e R10: dffffc0000000000 R11: ffffffff8a99b300 R12: ffffffff8a99b300 R13: ffff888037f01000 R14: ffff888011ad2500 R15: ffff888037f01578 FS: 000055557ab6d500(0000) GS:ffff88808d250000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffc9000d66fff8 CR3: 0000000043172000 CR4: 0000000000352ef0 Call Trace: <TASK> clip_push+0x6dc/0x720 net/atm/clip.c:200 clip_push+0x6dc/0x720 net/atm/clip.c:200 clip_push+0x6dc/0x720 net/atm/clip.c:200 ... clip_push+0x6dc/0x720 net/atm/clip.c:200 clip_push+0x6dc/0x720 net/atm/clip.c:200 clip_push+0x6dc/0x720 net/atm/clip.c:200 vcc_destroy_socket net/atm/common.c:183 [inline] vcc_release+0x157/0x460 net/atm/common.c:205 __sock_release net/socket.c:647 [inline] sock_close+0xc0/0x240 net/socket.c:1391 __fput+0x449/0xa70 fs/file_table.c:465 task_work_run+0x1d1/0x260 kernel/task_work.c:227 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] exit_to_user_mode_loop+0xec/0x110 kernel/entry/common.c:114 exit_to_user_mode_prepare include/linux/entry-common.h:330 [inline] syscall_exit_to_user_mode_work include/linux/entry-common.h:414 [inline] syscall_exit_to_user_mode include/linux/entry-common.h:449 [inline] do_syscall_64+0x2bd/0x3b0 arch/x86/entry/syscall_64.c:100 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7ff31c98e929 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fffb5aa1f78 EFLAGS: 00000246 ORIG_RAX: 00000000000001b4 RAX: 0000000000000000 RBX: 0000000000012747 RCX: 00007ff31c98e929 RDX: 0000000000000000 RSI: 000000000000001e RDI: 0000000000000003 RBP: 00007ff31cbb7ba0 R08: 0000000000000001 R09: 0000000db5aa226f R10: 00007ff31c7ff030 R11: 0000000000000246 R12: 00007ff31cbb608c R13: 00007ff31cbb6080 R14: ffffffffffffffff R15: 00007fffb5aa2090 </TASK> Modules linked in:
--- net/atm/clip.c | 2 ++ 1 file changed, 2 insertions(+)
net/atm/clip.c +2 -0
@@ -430,6 +430,8 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)if (!vcc->push)return -EBADFD ; +if (vcc->user_back) +return -EINVAL ; clip_vcc =kmalloc (sizeof (struct clip_vcc ),GFP_KERNEL );if (!clip_vcc)return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 114/148 atm: clip: Fix NULL pointer dereference in vcc_sendmsg()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yue Haibing <[email protected]>
[ Upstream commit 22fc46cea91df3dce140a7dc6847c6fcf0354505 ]
atmarpd_dev_ops does not implement the send method, which may cause crash as bellow.
BUG: kernel NULL pointer dereference, address: 0000000000000000 PGD 0 P4D 0 Oops: Oops: 0010 [#1] SMP KASAN NOPTI CPU: 0 UID: 0 PID: 5324 Comm: syz.0.0 Not tainted 6.15.0-rc6-syzkaller-00346-g5723cc3450bc #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 RIP: 0010:0x0 Code: Unable to access opcode bytes at 0xffffffffffffffd6. RSP: 0018:ffffc9000d3cf778 EFLAGS: 00010246 RAX: 1ffffffff1910dd1 RBX: 00000000000000c0 RCX: dffffc0000000000 RDX: ffffc9000dc82000 RSI: ffff88803e4c4640 RDI: ffff888052cd0000 RBP: ffffc9000d3cf8d0 R08: ffff888052c9143f R09: 1ffff1100a592287 R10: dffffc0000000000 R11: 0000000000000000 R12: 1ffff92001a79f00 R13: ffff888052cd0000 R14: ffff88803e4c4640 R15: ffffffff8c886e88 FS: 00007fbc762566c0(0000) GS:ffff88808d6c2000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 0000000041f1b000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> vcc_sendmsg+0xa10/0xc50 net/atm/common.c:644 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg+0x219/0x270 net/socket.c:727 ____sys_sendmsg+0x52d/0x830 net/socket.c:2566 ___sys_sendmsg+0x21f/0x2a0 net/socket.c:2620 __sys_sendmmsg+0x227/0x430 net/socket.c:2709 __do_sys_sendmmsg net/socket.c:2736 [inline] __se_sys_sendmmsg net/socket.c:2733 [inline] __x64_sys_sendmmsg+0xa0/0xc0 net/socket.c:2733 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xf6/0x210 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- net/atm/clip.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/atm/clip.c +9 -1
@@ -633,8 +633,16 @@ static void atmarpd_close(struct atm_vcc *vcc)module_put (THIS_MODULE ); } +static int atmarpd_send (struct atm_vcc *vcc,struct sk_buff *skb) +{ +atm_return_tx (vcc, skb); +dev_kfree_skb_any (skb); +return 0 ; +} +static const struct atmdev_ops atmarpd_dev_ops = { - .close = atmarpd_close + .close = atmarpd_close, + .send = atmarpd_send };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 115/148 net/sched: Abort __tc_modify_qdisc if parent class does not exist
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Nogueira <[email protected]>
[ Upstream commit ffdde7bf5a439aaa1955ebd581f5c64ab1533963 ]
Lion's patch [1] revealed an ancient bug in the qdisc API. Whenever a user creates/modifies a qdisc specifying as a parent another qdisc, the qdisc API will, during grafting, detect that the user is not trying to attach to a class and reject. However grafting is performed after qdisc_create (and thus the qdiscs' init callback) is executed. In qdiscs that eventually call qdisc_tree_reduce_backlog during init or change (such as fq, hhf, choke, etc), an issue arises. For example, executing the following commands:
sudo tc qdisc add dev lo root handle a: htb default 2 sudo tc qdisc add dev lo parent a: handle beef fq
Qdiscs such as fq, hhf, choke, etc unconditionally invoke qdisc_tree_reduce_backlog() in their control path init() or change() which then causes a failure to find the child class; however, that does not stop the unconditional invocation of the assumed child qdisc's qlen_notify with a null class. All these qdiscs make the assumption that class is non-null.
The solution is ensure that qdisc_leaf() which looks up the parent class, and is invoked prior to qdisc_create(), should return failure on not finding the class.
In this patch, we leverage qdisc_leaf to return ERR_PTRs whenever the parentid doesn't correspond to a class, so that we can detect it earlier on and abort before qdisc_create is called.
[1] https://lore.kernel.org/netdev/[email protected]/
--- net/sched/sch_api.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
net/sched/sch_api.c +16 -7
@@ -328,17 +328,22 @@ struct Qdisc *qdisc_lookup_rcu(struct net_device *dev, u32 handle)return q; } -static struct Qdisc *qdisc_leaf (struct Qdisc *p,u32 classid) +static struct Qdisc *qdisc_leaf (struct Qdisc *p,u32 classid, +struct netlink_ext_ack *extack) {unsigned long cl;const struct Qdisc_class_ops *cops = p->ops->cl_ops; -if (cops ==NULL ) -return NULL ; +if (cops ==NULL ) { +NL_SET_ERR_MSG (extack,"Parent qdisc is not classful" ); +return ERR_PTR (-EOPNOTSUPP ); + } cl = cops->find (p, classid); -if (cl ==0 ) -return NULL ; +if (cl ==0 ) { +NL_SET_ERR_MSG (extack,"Specified class not found" ); +return ERR_PTR (-ENOENT ); + }return cops->leaf (p, cl); }
@@ -1452,7 +1457,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,NL_SET_ERR_MSG (extack,"Failed to find qdisc with specified classid" );return -ENOENT ; } - q =qdisc_leaf (p, clid); + q =qdisc_leaf (p, clid, extack); }else if (dev_ingress_queue (dev)) { q =dev_ingress_queue (dev)->qdisc_sleeping; }
@@ -1463,6 +1468,8 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,NL_SET_ERR_MSG (extack,"Cannot find specified qdisc on specified device" );return -ENOENT ; } +if (IS_ERR (q)) +return PTR_ERR (q);if (tcm->tcm_handle && q->handle != tcm->tcm_handle) {NL_SET_ERR_MSG (extack,"Invalid handle" );
@@ -1559,7 +1566,9 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,NL_SET_ERR_MSG (extack,"Failed to find specified qdisc" );return -ENOENT ; } - q =qdisc_leaf (p, clid); + q =qdisc_leaf (p, clid, extack); +if (IS_ERR (q)) +return PTR_ERR (q); }else if (dev_ingress_queue_create (dev)) { q =dev_ingress_queue (dev)->qdisc_sleeping; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 116/148 rxrpc: Fix oops due to non-existence of prealloc backlog struct
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
commit 880a88f318cf1d2a0f4c0a7ff7b07e2062b434a4 upstream.
If an AF_RXRPC service socket is opened and bound, but calls are preallocated, then rxrpc_alloc_incoming_call() will oops because the rxrpc_backlog struct doesn't get allocated until the first preallocation is made.
Fix this by returning NULL from rxrpc_alloc_incoming_call() if there is no backlog struct. This will cause the incoming call to be aborted.
--- net/rxrpc/call_accept.c | 3 +++ 1 file changed, 3 insertions(+)
net/rxrpc/call_accept.c +3 -0
@@ -281,6 +281,9 @@ static struct rxrpc_call *rxrpc_alloc_inunsigned short call_tail, conn_tail, peer_tail;unsigned short call_count, conn_count; +if (!b) +return NULL ; +/* #calls >= #conns >= #peers must hold true. */ call_head =smp_load_acquire (&b->call_backlog_head); call_tail = b->call_backlog_tail;
Greg Kroah-Hartman
maintainerPATCH 117/148 x86/mce/amd: Fix threshold limit reset
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yazen Ghannam <[email protected]>
commit 5f6e3b720694ad771911f637a51930f511427ce1 upstream.
The MCA threshold limit must be reset after servicing the interrupt.
Currently, the restart function doesn't have an explicit check for this. It makes some assumptions based on the current limit and what's in the registers. These assumptions don't always hold, so the limit won't be reset in some cases.
Make the reset condition explicit. Either an interrupt/overflow has occurred or the bank is being initialized.
--- arch/x86/kernel/cpu/mce/amd.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/mce/amd.c +7 -8
@@ -290,7 +290,6 @@ static void smca_configure(unsigned intstruct thresh_restart {struct threshold_block *b; -int reset;int set_lvt_off;int lvt_off;u16 old_limit;
@@ -381,13 +380,13 @@ static void threshold_restart_bank(voidrdmsr (tr->b->address, lo, hi); -if (tr->b->threshold_limit < (hi &THRESHOLD_MAX )) - tr->reset =1 ;/* limit cannot be lower than err count */ - -if (tr->reset) {/* reset err count and overflow bit */ - hi = - (hi & ~(MASK_ERR_COUNT_HI |MASK_OVERFLOW_HI )) | - (THRESHOLD_MAX - tr->b->threshold_limit); +/* +* Reset error count and overflow bit. +* This is done during init or after handling an interrupt. +*/ +if (hi &MASK_OVERFLOW_HI || tr->set_lvt_off) { + hi &= ~(MASK_ERR_COUNT_HI |MASK_OVERFLOW_HI ); + hi |=THRESHOLD_MAX - tr->b->threshold_limit; }else if (tr->old_limit) {/* change limit w/o reset */ int new_count = (hi &THRESHOLD_MAX ) + (tr->old_limit - tr->b->threshold_limit);
Greg Kroah-Hartman
maintainerPATCH 118/148 x86/mce: Dont remove sysfs if thresholding sysfs init fails
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yazen Ghannam <[email protected]>
commit 4c113a5b28bfd589e2010b5fc8867578b0135ed7 upstream.
Currently, the MCE subsystem sysfs interface will be removed if the thresholding sysfs interface fails to be created. A common failure is due to new MCA bank types that are not recognized and don't have a short name set.
The MCA thresholding feature is optional and should not break the common MCE sysfs interface. Also, new MCA bank types are occasionally introduced, and updates will be needed to recognize them. But likewise, this should not break the common sysfs interface.
Keep the MCE sysfs interface regardless of the status of the thresholding sysfs interface.
--- arch/x86/kernel/cpu/mce/core.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
arch/x86/kernel/cpu/mce/core.c +1 -7
@@ -2464,15 +2464,9 @@ static int mce_cpu_dead(unsigned int cpustatic int mce_cpu_online (unsigned int cpu) {struct timer_list *t =this_cpu_ptr (&mce_timer); -int ret;mce_device_create (cpu); - - ret =mce_threshold_create_device (cpu); -if (ret) { -mce_device_remove (cpu); -return ret; - } +mce_threshold_create_device (cpu);mce_reenable_cpu ();mce_start_timer (t);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 119/148 x86/mce: Make sure CMCI banks are cleared during shutdown on Intel
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: JP Kobryn <[email protected]>
commit 30ad231a5029bfa16e46ce868497b1a5cdd3c24d upstream.
CMCI banks are not cleared during shutdown on Intel CPUs. As a side effect, when a kexec is performed, CPUs coming back online are unable to rediscover/claim these occupied banks which breaks MCE reporting.
Clear the CPU ownership during shutdown via cmci_clear() so the banks can be reclaimed and MCE reporting will become functional once more.
[ bp: Massage commit message. ]
--- arch/x86/kernel/cpu/mce/intel.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/mce/intel.c +1 -0
@@ -516,4 +516,5 @@ void mce_intel_feature_init(struct cpuinvoid mce_intel_feature_clear (struct cpuinfo_x86 *c) {intel_clear_lmce (); +cmci_clear (); }
Greg Kroah-Hartman
maintainerPATCH 102/148 media: uvcvideo: Return the number of processed controls
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit ba4fafb02ad6a4eb2e00f861893b5db42ba54369 upstream.
If we let know our callers that we have not done anything, they will be able to optimize their decisions.
Message-ID: <[email protected]>
--- drivers/media/usb/uvc/uvc_ctrl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_ctrl.c +10 -1
@@ -1560,11 +1560,16 @@ int uvc_ctrl_begin(struct uvc_video_chaireturn mutex_lock_interruptible (&chain->ctrl_mutex) ? -ERESTARTSYS :0 ; } +/* +* Returns the number of uvc controls that have been correctly set, or a +* negative number if there has been an error. +*/ static int uvc_ctrl_commit_entity (struct uvc_device *dev,struct uvc_fh *handle,struct uvc_entity *entity,int rollback) { +unsigned int processed_ctrls =0 ;struct uvc_control *ctrl;unsigned int i;int ret;
@@ -1598,6 +1603,9 @@ static int uvc_ctrl_commit_entity(structelse ret =0 ; +if (!ret) + processed_ctrls++; +if (rollback || ret <0 ) memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP),
@@ -1613,7 +1621,7 @@ static int uvc_ctrl_commit_entity(structuvc_ctrl_set_handle (handle, ctrl, handle); } -return 0 ; +return processed_ctrls; } int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
@@ -1634,6 +1642,7 @@ int __uvc_ctrl_commit(struct uvc_fh *hanif (!rollback)uvc_ctrl_send_events (handle, xctrls, xctrls_count); + ret =0 ; done:mutex_unlock (&chain->ctrl_mutex);return ret;
Greg Kroah-Hartman
maintainerPATCH 120/148 pinctrl: qcom: msm: mark certain pins as invalid for interrupts
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
commit 93712205ce2f1fb047739494c0399a26ea4f0890 upstream.
On some platforms, the UFS-reset pin has no interrupt logic in TLMM but is nevertheless registered as a GPIO in the kernel. This enables the user-space to trigger a BUG() in the pinctrl-msm driver by running, for
example: gpiomon -c 0 113 on RB2.
The exact culprit is requesting pins whose intr_detection_width setting is not 1 or 2 for interrupts. This hits a BUG() in msm_gpio_irq_set_type(). Potentially crashing the kernel due to an invalid request from user-space is not optimal, so let's go through the pins and mark those that would fail the check as invalid for the irq chip as we should not even register them as available irqs.
This function can be extended if we determine that there are more corner-cases like this.
--- drivers/pinctrl/qcom/pinctrl-msm.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/pinctrl/qcom/pinctrl-msm.c +20 -0
@@ -812,6 +812,25 @@ static void msm_gpio_irq_ack(struct irq_raw_spin_unlock_irqrestore (&pctrl->lock, flags); } +static void msm_gpio_irq_init_valid_mask (struct gpio_chip *gc, +unsigned long *valid_mask, +unsigned int ngpios) +{ +struct msm_pinctrl *pctrl =gpiochip_get_data (gc); +const struct msm_pingroup *g; +int i; + +bitmap_fill (valid_mask, ngpios); + +for (i =0 ; i < ngpios; i++) { + g = &pctrl->soc->groups[i]; + +if (g->intr_detection_width !=1 && + g->intr_detection_width !=2 ) +clear_bit (i, valid_mask); + } +} +static int msm_gpio_irq_set_type (struct irq_data *d,unsigned int type) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d);
@@ -1039,6 +1058,7 @@ static int msm_gpio_init(struct msm_pinc girq->default_type =IRQ_TYPE_NONE ; girq->handler = handle_bad_irq; girq->parents[0 ] = pctrl->irq; + girq->init_valid_mask = msm_gpio_irq_init_valid_mask; ret =gpiochip_add_data (&pctrl->chip, pctrl);if (ret) {
Greg Kroah-Hartman
maintainerPATCH 121/148 drm/sched: Increment job count before swapping tail spsc queue
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Brost <[email protected]>
commit 8af39ec5cf2be522c8eb43a3d8005ed59e4daaee upstream.
A small race exists between spsc_queue_push and the run-job worker, in which spsc_queue_push may return not-first while the run-job worker has already idled due to the job count being zero. If this race occurs, job scheduling stops, leading to hangs while waiting on the job’s DMA fences.
Seal this race by incrementing the job count before appending to the SPSC queue.
This race was observed on a drm-tip 6.16-rc1 build with the Xe driver in an SVM test case.
--- include/drm/spsc_queue.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/drm/spsc_queue.h +3 -1
@@ -70,9 +70,11 @@ static inline bool spsc_queue_push(strucpreempt_disable (); +atomic_inc (&queue->job_count); +smp_mb__after_atomic (); + tail = (struct spsc_node **)atomic_long_xchg (&queue->tail, (long )&node->next);WRITE_ONCE (*tail, node); -atomic_inc (&queue->job_count);/* * In case of first element verify new node will be visible to the consumer
Greg Kroah-Hartman
maintainerPATCH 122/148 usb: gadget: u_serial: Fix race condition in TTY wakeup
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuen-Han Tsai <[email protected]>
commit c529c3730bd09115684644e26bf01ecbd7e2c2c9 upstream.
A race condition occurs when gs_start_io() calls either gs_start_rx() or gs_start_tx(), as those functions briefly drop the port_lock for usb_ep_queue(). This allows gs_close() and gserial_disconnect() to clear port.tty and port_usb, respectively.
Use the null-safe TTY Port helper function to wake up TTY.
Example
CPU1: CPU2:
gserial_connect() // lock
gs_close() // await lock
gs_start_rx() // unlock
usb_ep_queue()
gs_close() // lock, reset port.tty and unlock
gs_start_rx() // lock
tty_wakeup() // NPE
--- drivers/usb/gadget/function/u_serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/gadget/function/u_serial.c +3 -3
@@ -286,8 +286,8 @@ __acquires(&port->port_lock)break ; } -if (do_tty_wake && port->port.tty) -tty_wakeup (port->port.tty); +if (do_tty_wake) +tty_port_tty_wakeup (&port->port);return status; }
@@ -564,7 +564,7 @@ static int gs_start_io(struct gs_port *pgs_start_tx (port);/* Unblock any pending writes into our circular buffer, in case * we didn't in gs_start_tx() */ -tty_wakeup (port->port.tty); +tty_port_tty_wakeup (&port->port); }else {/* Free reqs only if we are still connected */ if (port->port_usb) {
Greg Kroah-Hartman
maintainerPATCH 123/148 Revert "ACPI: battery: negate current when discharging"
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
commit de1675de39aa945bad5937d1fde4df3682670639 upstream.
Revert commit 234f71555019 ("ACPI: battery: negate current when discharging") breaks not one but several userspace implementations of battery monitoring: Steam and MangoHud. Perhaps it breaks more, but those are the two that have been tested.
--- drivers/acpi/battery.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/acpi/battery.c +3 -16
@@ -266,23 +266,10 @@ static int acpi_battery_get_property(strbreak ;case POWER_SUPPLY_PROP_CURRENT_NOW :case POWER_SUPPLY_PROP_POWER_NOW : -if (battery->rate_now ==ACPI_BATTERY_VALUE_UNKNOWN ) { +if (battery->rate_now ==ACPI_BATTERY_VALUE_UNKNOWN ) ret = -ENODEV ; -break ; - } - - val->intval = battery->rate_now *1000 ; -/* -* When discharging, the current should be reported as a -* negative number as per the power supply class interface -* definition. -*/ -if (psp ==POWER_SUPPLY_PROP_CURRENT_NOW && - (battery->state &ACPI_BATTERY_STATE_DISCHARGING ) && -acpi_battery_handle_discharging (battery) - ==POWER_SUPPLY_STATUS_DISCHARGING ) - val->intval = -val->intval; - +else + val->intval = battery->rate_now *1000 ;break ;case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN :case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN :
Greg Kroah-Hartman
maintainerPATCH 124/148 pwm: mediatek: Ensure to disable clocks in error path
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
commit 505b730ede7f5c4083ff212aa955155b5b92e574 upstream.
After enabling the clocks each error path must disable the clocks again. One of them failed to do so. Unify the error paths to use goto to make it harder for future changes to add a similar bug.
--- drivers/pwm/pwm-mediatek.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/pwm/pwm-mediatek.c +9 -6
@@ -134,8 +134,10 @@ static int pwm_mediatek_config(struct pwreturn ret; clk_rate =clk_get_rate (pc->clk_pwms[pwm->hwpwm]); -if (!clk_rate) -return -EINVAL ; +if (!clk_rate) { + ret = -EINVAL ; + goto out; + }/* Make sure we use the bus clock and not the 26MHz clock */ if (pc->soc->has_ck_26m_sel)
@@ -154,9 +156,9 @@ static int pwm_mediatek_config(struct pw }if (clkdiv >PWM_CLK_DIV_MAX ) { -pwm_mediatek_clk_disable (chip, pwm); -dev_err (chip->dev,"period %d not supported\n" , period_ns); -return -EINVAL ; +dev_err (chip->dev,"period of %d ns not supported\n" , period_ns); + ret = -EINVAL ; + goto out; }if (pc->soc->pwm45_fixup && pwm->hwpwm >2 ) {
@@ -173,9 +175,10 @@ static int pwm_mediatek_config(struct pwpwm_mediatek_writel (pc, pwm->hwpwm, reg_width, cnt_period);pwm_mediatek_writel (pc, pwm->hwpwm, reg_thres, cnt_duty); +out:pwm_mediatek_clk_disable (chip, pwm); -return 0 ; +return ret; }static int pwm_mediatek_enable (struct pwm_chip *chip,struct pwm_device *pwm)
Greg Kroah-Hartman
maintainerPATCH 125/148 netlink: make sure we allow at least one dump skb
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
commit a215b5723922f8099078478122f02100e489cb80 upstream.
Commit under Fixes tightened up the memory accounting for Netlink sockets. Looks like the accounting is too strict for some existing use cases, Marek reported issues with nl80211 / WiFi iw CLI.
To reduce number of iterations Netlink dumps try to allocate messages based on the size of the buffer passed to previous recvmsg() calls. If user space uses a larger buffer in recvmsg() than sk_rcvbuf we will allocate an skb we won't be able to queue.
Make sure we always allow at least one skb to be queued. Same workaround is already present in netlink_attachskb(). Alternative would be to cap the allocation size to
rcvbuf - rmem_alloc
but as I said, the workaround is already present in other places.
--- net/netlink/af_netlink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netlink/af_netlink.c +3 -2
@@ -2186,11 +2186,11 @@ static int netlink_dump(struct sock *sk)struct netlink_ext_ack extack = {};struct netlink_callback *cb;struct sk_buff *skb =NULL ; +unsigned int rmem, rcvbuf;struct nlmsghdr *nlh;struct module *module;int err = -ENOBUFS ;int alloc_min_size; -unsigned int rmem;int alloc_size;mutex_lock (nlk->cb_mutex);
@@ -2220,8 +2220,9 @@ static int netlink_dump(struct sock *sk)if (!skb) goto errout_skb; + rcvbuf =READ_ONCE (sk->sk_rcvbuf); rmem =atomic_add_return (skb->truesize, &sk->sk_rmem_alloc); -if (rmem >=READ_ONCE (sk->sk_rcvbuf)) { +if (rmem != skb->truesize && rmem >= rcvbuf) {atomic_sub (skb->truesize, &sk->sk_rmem_alloc); goto errout_skb; }
Greg Kroah-Hartman
maintainerPATCH 126/148 netlink: Fix rmem check in netlink_broadcast_deliver().
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
commit a3c4a125ec725cefb40047eb05ff9eafd57830b4 upstream.
We need to allow queuing at least one skb even when skb is larger than sk->sk_rcvbuf.
The cited commit made a mistake while converting a condition in netlink_broadcast_deliver().
Let's correct the rmem check for the allow-one-skb rule.
--- net/netlink/af_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netlink/af_netlink.c +1 -1
@@ -1390,7 +1390,7 @@ static int netlink_broadcast_deliver(str rmem =atomic_add_return (skb->truesize, &sk->sk_rmem_alloc); rcvbuf =READ_ONCE (sk->sk_rcvbuf); -if ((rmem != skb->truesize || rmem <= rcvbuf) && +if ((rmem == skb->truesize || rmem <= rcvbuf) && !test_bit (NETLINK_S_CONGESTED , &nlk->state)) {netlink_skb_set_owner_r (skb, sk);__netlink_sendskb (sk, skb);
Greg Kroah-Hartman
maintainerPATCH 127/148 RDMA/mlx5: Fix vport loopback for MPV device
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit a9a9e68954f29b1e197663f76289db4879fd51bb ]
Always enable vport loopback for both MPV devices on driver start.
Previously in some cases related to MPV RoCE, packets weren't correctly executing loopback check at vport in FW, since it was disabled. Due to complexity of identifying such cases for MPV always enable vport loopback for both GVMIs when binding the slave to the master port.
--- drivers/infiniband/hw/mlx5/main.c | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/infiniband/hw/mlx5/main.c +33 -0
@@ -1686,6 +1686,33 @@ static void deallocate_uars(struct mlx5_ib_dev *dev,mlx5_cmd_free_uar (dev->mdev, bfregi->sys_pages[i]); } +static int mlx5_ib_enable_lb_mp (struct mlx5_core_dev *master, +struct mlx5_core_dev *slave) +{ +int err; + + err =mlx5_nic_vport_update_local_lb (master, true); +if (err) +return err; + + err =mlx5_nic_vport_update_local_lb (slave, true); +if (err) + goto out; + +return 0 ; + +out: +mlx5_nic_vport_update_local_lb (master, false); +return err; +} + +static void mlx5_ib_disable_lb_mp (struct mlx5_core_dev *master, +struct mlx5_core_dev *slave) +{ +mlx5_nic_vport_update_local_lb (slave, false); +mlx5_nic_vport_update_local_lb (master, false); +} +int mlx5_ib_enable_lb (struct mlx5_ib_dev *dev,bool td,bool qp) {int err =0 ;
@@ -5839,6 +5866,8 @@ static void mlx5_ib_unbind_slave_port(struct mlx5_ib_dev *ibdev,lockdep_assert_held (&mlx5_ib_multiport_mutex); +mlx5_ib_disable_lb_mp (ibdev->mdev, mpi->mdev); +mlx5_ib_cleanup_cong_debugfs (ibdev, port_num);spin_lock (&port->mp.mpi_lock);
@@ -5927,6 +5956,10 @@ static bool mlx5_ib_bind_slave_port(struct mlx5_ib_dev *ibdev,mlx5_ib_init_cong_debugfs (ibdev, port_num); + err =mlx5_ib_enable_lb_mp (ibdev->mdev, mpi->mdev); +if (err) + goto unbind; +return true; unbind:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 128/148 flexfiles/pNFS: update stats on NFS4ERR_DELAY for v4.1 DSes
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tigran Mkrtchyan <[email protected]>
[ Upstream commit e3e3775392f3f0f3e3044f8c162bf47858e01759 ]
On NFS4ERR_DELAY nfs slient updates its stats, but misses for flexfiles v4.1 DSes.
Stable-dep-of: 38074de35b01 ("NFSv4/flexfiles: Fix handling of NFS level errors in I/O")
--- fs/nfs/flexfilelayout/flexfilelayout.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/flexfilelayout/flexfilelayout.c +2 -0
@@ -1153,6 +1153,8 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,nfs4_schedule_session_recovery (clp->cl_session, task->tk_status);break ;case -NFS4ERR_DELAY : +nfs_inc_stats (lseg->pls_layout->plh_inode,NFSIOS_DELAY ); + fallthrough;case -NFS4ERR_GRACE :rpc_delay (task,FF_LAYOUT_POLL_RETRY_MAX );break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 129/148 NFSv4/flexfiles: Fix handling of NFS level errors in I/O
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit 38074de35b015df5623f524d6f2b49a0cd395c40 ]
Allow the flexfiles error handling to recognise NFS level errors (as opposed to RPC level errors) and handle them separately. The main motivator is the NFSERR_PERM errors that get returned if the NFS client connects to the data server through a port number that is lower than 1024. In that case, the client should disconnect and retry a READ on a different data server, or it should retry a WRITE after reconnecting.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 142 ++++++++++++++++++------- 1 file changed, 104 insertions(+), 38 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +104 -38
@@ -1129,6 +1129,7 @@ static void ff_layout_reset_read(struct nfs_pgio_header *hdr) } static int ff_layout_async_handle_error_v4(struct rpc_task *task, + u32 op_status, struct nfs4_state *state, struct nfs_client *clp, struct pnfs_layout_segment *lseg,
@@ -1139,34 +1140,42 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,struct nfs4_deviceid_node *devid =FF_LAYOUT_DEVID_NODE (lseg, idx);struct nfs4_slot_table *tbl = &clp->cl_session->fc_slot_table; -switch (task->tk_status) { -case -NFS4ERR_BADSESSION : -case -NFS4ERR_BADSLOT : -case -NFS4ERR_BAD_HIGH_SLOT : -case -NFS4ERR_DEADSESSION : -case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION : -case -NFS4ERR_SEQ_FALSE_RETRY : -case -NFS4ERR_SEQ_MISORDERED : +switch (op_status) { +case NFS4_OK : +case NFS4ERR_NXIO : +break ; +case NFSERR_PERM : +if (!task->tk_xprt) +break ; +xprt_force_disconnect (task->tk_xprt); + goto out_retry; +case NFS4ERR_BADSESSION : +case NFS4ERR_BADSLOT : +case NFS4ERR_BAD_HIGH_SLOT : +case NFS4ERR_DEADSESSION : +case NFS4ERR_CONN_NOT_BOUND_TO_SESSION : +case NFS4ERR_SEQ_FALSE_RETRY : +case NFS4ERR_SEQ_MISORDERED :dprintk ("%s ERROR %d, Reset session. Exchangeid " "flags 0x%x\n" , __func__, task->tk_status, clp->cl_exchange_flags);nfs4_schedule_session_recovery (clp->cl_session, task->tk_status); -break ; -case -NFS4ERR_DELAY : + goto out_retry; +case NFS4ERR_DELAY :nfs_inc_stats (lseg->pls_layout->plh_inode,NFSIOS_DELAY ); fallthrough; -case -NFS4ERR_GRACE : +case NFS4ERR_GRACE :rpc_delay (task,FF_LAYOUT_POLL_RETRY_MAX ); -break ; -case -NFS4ERR_RETRY_UNCACHED_REP : -break ; + goto out_retry; +case NFS4ERR_RETRY_UNCACHED_REP : + goto out_retry;/* Invalidate Layout errors */ -case -NFS4ERR_PNFS_NO_LAYOUT : -case -ESTALE :/* mapped NFS4ERR_STALE */ -case -EBADHANDLE :/* mapped NFS4ERR_BADHANDLE */ -case -EISDIR :/* mapped NFS4ERR_ISDIR */ -case -NFS4ERR_FHEXPIRED : -case -NFS4ERR_WRONG_TYPE : +case NFS4ERR_PNFS_NO_LAYOUT : +case NFS4ERR_STALE : +case NFS4ERR_BADHANDLE : +case NFS4ERR_ISDIR : +case NFS4ERR_FHEXPIRED : +case NFS4ERR_WRONG_TYPE :dprintk ("%s Invalid layout error %d\n" , __func__, task->tk_status);/*
@@ -1179,6 +1188,11 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,pnfs_destroy_layout (NFS_I (inode));rpc_wake_up (&tbl->slot_tbl_waitq); goto reset; +default : +break ; + } + +switch (task->tk_status) {/* RPC connection errors */ case -ECONNREFUSED :case -EHOSTDOWN :
@@ -1192,26 +1206,56 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,nfs4_delete_deviceid (devid->ld, devid->nfs_client, &devid->deviceid);rpc_wake_up (&tbl->slot_tbl_waitq); -/* fall through */ +break ;default : -if (ff_layout_avoid_mds_available_ds (lseg)) -return -NFS4ERR_RESET_TO_PNFS ; -reset: -dprintk ("%s Retry through MDS. Error %d\n" , __func__, - task->tk_status); -return -NFS4ERR_RESET_TO_MDS ; +break ; } + +if (ff_layout_avoid_mds_available_ds (lseg)) +return -NFS4ERR_RESET_TO_PNFS ; +reset: +dprintk ("%s Retry through MDS. Error %d\n" , __func__, + task->tk_status); +return -NFS4ERR_RESET_TO_MDS ; + +out_retry: task->tk_status =0 ;return -EAGAIN ; }/* Retry all errors through either pNFS or MDS except for -EJUKEBOX */ static int ff_layout_async_handle_error_v3 (struct rpc_task *task, +u32 op_status, +struct nfs_client *clp,struct pnfs_layout_segment *lseg,int idx) {struct nfs4_deviceid_node *devid =FF_LAYOUT_DEVID_NODE (lseg, idx); +switch (op_status) { +case NFS_OK : +case NFSERR_NXIO : +break ; +case NFSERR_PERM : +if (!task->tk_xprt) +break ; +xprt_force_disconnect (task->tk_xprt); + goto out_retry; +case NFSERR_ACCES : +case NFSERR_BADHANDLE : +case NFSERR_FBIG : +case NFSERR_IO : +case NFSERR_NOSPC : +case NFSERR_ROFS : +case NFSERR_STALE : + goto out_reset_to_pnfs; +case NFSERR_JUKEBOX : +nfs_inc_stats (lseg->pls_layout->plh_inode,NFSIOS_DELAY ); + goto out_retry; +default : +break ; + } +switch (task->tk_status) {/* File access problems. Don't mark the device as unavailable */ case -EACCES :
@@ -1230,6 +1274,7 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task,nfs4_delete_deviceid (devid->ld, devid->nfs_client, &devid->deviceid); } +out_reset_to_pnfs:/* FIXME: Need to prevent infinite looping here. */ return -NFS4ERR_RESET_TO_PNFS ; out_retry:
@@ -1240,6 +1285,7 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task, } static int ff_layout_async_handle_error(struct rpc_task *task, + u32 op_status, struct nfs4_state *state, struct nfs_client *clp, struct pnfs_layout_segment *lseg,
@@ -1258,10 +1304,11 @@ static int ff_layout_async_handle_error(struct rpc_task *task,switch (vers) {case 3 : -return ff_layout_async_handle_error_v3 (task, lseg, idx); -case 4 : -return ff_layout_async_handle_error_v4 (task, state, clp, +return ff_layout_async_handle_error_v3 (task, op_status, clp, lseg, idx); +case 4 : +return ff_layout_async_handle_error_v4 (task, op_status, state, + clp, lseg, idx);default :/* should never happen */ WARN_ON_ONCE (1 );
@@ -1306,7 +1353,17 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,switch (status) {case NFS4ERR_DELAY :case NFS4ERR_GRACE : -return ; +case NFS4ERR_PERM : +break ; +case NFS4ERR_NXIO : +ff_layout_mark_ds_unreachable (lseg, idx); +/* +* Don't return the layout if this is a read and we still +* have layouts to try +*/ +if (opnum ==OP_READ ) +break ; + fallthrough;default :break ; }
@@ -1329,12 +1386,15 @@ static int ff_layout_read_done_cb(struct rpc_task *task,int err;trace_nfs4_pnfs_read (hdr, task->tk_status); -if (task->tk_status <0 ) +if (task->tk_status <0 ) {ff_layout_io_track_ds_error (hdr->lseg, hdr->pgio_mirror_idx, hdr->args.offset, hdr->args.count, hdr->res.op_status,OP_READ , task->tk_status); - err =ff_layout_async_handle_error (task, hdr->args.context->state, + } + + err =ff_layout_async_handle_error (task, hdr->res.op_status, + hdr->args.context->state, hdr->ds_clp, hdr->lseg, hdr->pgio_mirror_idx);
@@ -1502,12 +1562,15 @@ static int ff_layout_write_done_cb(struct rpc_task *task,int err;trace_nfs4_pnfs_write (hdr, task->tk_status); -if (task->tk_status <0 ) +if (task->tk_status <0 ) {ff_layout_io_track_ds_error (hdr->lseg, hdr->pgio_mirror_idx, hdr->args.offset, hdr->args.count, hdr->res.op_status,OP_WRITE , task->tk_status); - err =ff_layout_async_handle_error (task, hdr->args.context->state, + } + + err =ff_layout_async_handle_error (task, hdr->res.op_status, + hdr->args.context->state, hdr->ds_clp, hdr->lseg, hdr->pgio_mirror_idx);
@@ -1545,13 +1608,16 @@ static int ff_layout_commit_done_cb(struct rpc_task *task,int err;trace_nfs4_pnfs_commit_ds (data, task->tk_status); -if (task->tk_status <0 ) +if (task->tk_status <0 ) {ff_layout_io_track_ds_error (data->lseg, data->ds_commit_index, data->args.offset, data->args.count, data->res.op_status,OP_COMMIT , task->tk_status); - err =ff_layout_async_handle_error (task,NULL , data->ds_clp, - data->lseg, data->ds_commit_index); + } + + err =ff_layout_async_handle_error (task, data->res.op_status, +NULL , data->ds_clp, data->lseg, + data->ds_commit_index);switch (err) {case -NFS4ERR_RESET_TO_PNFS :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 103/148 media: uvcvideo: Send control events for partial succeeds
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit 5c791467aea6277430da5f089b9b6c2a9d8a4af7 upstream.
Today, when we are applying a change to entities A, B. If A succeeds and B fails the events for A are not sent.
This change changes the code so the events for A are send right after they happen.
Message-ID: <[email protected]>
--- drivers/media/usb/uvc/uvc_ctrl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +9 -3
@@ -1429,7 +1429,9 @@ static bool uvc_ctrl_xctrls_has_control( }static void uvc_ctrl_send_events (struct uvc_fh *handle, -const struct v4l2_ext_control *xctrls,unsigned int xctrls_count) +struct uvc_entity *entity, +const struct v4l2_ext_control *xctrls, +unsigned int xctrls_count) {struct uvc_control_mapping *mapping;struct uvc_control *ctrl;
@@ -1440,6 +1442,9 @@ static void uvc_ctrl_send_events(structu32 changes =V4L2_EVENT_CTRL_CH_VALUE ; ctrl =uvc_find_control (handle->chain, xctrls[i].id, &mapping); +if (ctrl->entity != entity) +continue ; +if (ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS )/* Notification will be sent from an Interrupt event. */ continue ;
@@ -1638,10 +1643,11 @@ int __uvc_ctrl_commit(struct uvc_fh *han rollback);if (ret <0 ) goto done; +else if (ret >0 && !rollback) +uvc_ctrl_send_events (handle, entity, xctrls, + xctrls_count); } -if (!rollback) -uvc_ctrl_send_events (handle, xctrls, xctrls_count); ret =0 ; done:mutex_unlock (&chain->ctrl_mutex);
Greg Kroah-Hartman
maintainerPATCH 130/148 Input: xpad - add support for Amazon Game Controller
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Reynolds <[email protected]>
[ Upstream commit 05665cef4b745cb46b1d1b8e96deaa25464092d3 ]
The Amazon Luna controller (product name "Amazon Game Controller") behaves like an Xbox 360 controller when connected over USB.
Stable-dep-of: 22c69d786ef8 ("Input: xpad - support Acer NGR 200 Controller")
--- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/joystick/xpad.c +2 -0
@@ -275,6 +275,7 @@ static const struct xpad_device { { 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 }, { 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 }, { 0x1689, 0xfe00, "Razer Sabertooth", 0, XTYPE_XBOX360 }, + { 0x1949, 0x041a, "Amazon Game Controller", 0, XTYPE_XBOX360 }, { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 }, { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1bad, 0x0130, "Ion Drum Rocker", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
@@ -462,6 +463,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOX360_VENDOR (0x15e4 ),/* Numark X-Box 360 controllers */ XPAD_XBOX360_VENDOR (0x162e ),/* Joytech X-Box 360 controllers */ XPAD_XBOX360_VENDOR (0x1689 ),/* Razer Onza */ +XPAD_XBOX360_VENDOR (0x1949 ),/* Amazon controllers */ XPAD_XBOX360_VENDOR (0x1bad ),/* Harminix Rock Band Guitar and Drums */ XPAD_XBOX360_VENDOR (0x20d6 ),/* PowerA Controllers */ XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 131/148 Input: xpad - add VID for Turtle Beach controllers
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vicki Pfau <[email protected]>
[ Upstream commit 1999a6b12a3b5c8953fc9ec74863ebc75a1b851d ]
This adds support for the Turtle Beach REACT-R and Recon Xbox controllers
Stable-dep-of: 22c69d786ef8 ("Input: xpad - support Acer NGR 200 Controller")
--- drivers/input/joystick/xpad.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/joystick/xpad.c +1 -0
@@ -452,6 +452,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOX360_VENDOR (0x0f0d ),/* Hori Controllers */ XPAD_XBOXONE_VENDOR (0x0f0d ),/* Hori Controllers */ XPAD_XBOX360_VENDOR (0x1038 ),/* SteelSeries Controllers */ +XPAD_XBOXONE_VENDOR (0x10f5 ),/* Turtle Beach Controllers */ XPAD_XBOX360_VENDOR (0x11c9 ),/* Nacon GC100XF */ XPAD_XBOX360_VENDOR (0x11ff ),/* PXN V900 */ XPAD_XBOX360_VENDOR(0x1209), /* Ardwiino Controllers */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 132/148 Input: xpad - support Acer NGR 200 Controller
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nilton Perim Neto <[email protected]>
[ Upstream commit 22c69d786ef8fb789c61ca75492a272774221324 ]
Add the NGR 200 Xbox 360 to the list of recognized controllers.
--- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/joystick/xpad.c +2 -0
@@ -147,6 +147,7 @@ static const struct xpad_device { { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", 0, XTYPE_XBOX }, { 0x05fe, 0x3030, "Chic Controller", 0, XTYPE_XBOX }, { 0x05fe, 0x3031, "Chic Controller", 0, XTYPE_XBOX }, + { 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX }, { 0x062a, 0x0020, "Logic3 Xbox GamePad", 0, XTYPE_XBOX }, { 0x062a, 0x0033, "Competition Pro Steering Wheel", 0, XTYPE_XBOX }, { 0x06a3, 0x0200, "Saitek Racing Wheel", 0, XTYPE_XBOX },
@@ -440,6 +441,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOX360_VENDOR (0x045e ),/* Microsoft X-Box 360 controllers */ XPAD_XBOXONE_VENDOR (0x045e ),/* Microsoft X-Box One controllers */ XPAD_XBOX360_VENDOR (0x046d ),/* Logitech X-Box 360 style controllers */ +XPAD_XBOX360_VENDOR (0x0502 ),/* Acer Inc. Xbox 360 style controllers */ XPAD_XBOX360_VENDOR (0x056e ),/* Elecom JC-U3613M */ XPAD_XBOX360_VENDOR (0x06a3 ),/* Saitek P3600 */ XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 133/148 dma-buf: fix timeout handling in dma_resv_wait_timeout v2
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian König <[email protected]>
[ Upstream commit 2b95a7db6e0f75587bffddbb490399cbb87e4985 ]
Even the kerneldoc says that with a zero timeout the function should not wait for anything, but still return 1 to indicate that the fences are signaled now.
Unfortunately that isn't what was implemented, instead of only returning 1 we also waited for at least one jiffies.
Fix that by adjusting the handling to what the function is actually documented to do.
v2: improve code readability
--- drivers/dma-buf/dma-resv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/dma-buf/dma-resv.c +4 -1
@@ -558,10 +558,13 @@ long dma_resv_wait_timeout_rcu(struct dma_resv *obj, goto retry; } - ret =dma_fence_wait_timeout (fence, intr, ret); + ret =dma_fence_wait_timeout (fence, intr, timeout);dma_fence_put (fence);if (ret >0 && wait_all && (i +1 < shared_count)) goto retry; +/* Even for zero timeout the return value is 1 */ +if (ret >0 && timeout ==0 ) + ret =1 ; }return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 104/148 media: uvcvideo: Rollback non processed entities on error
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit a70705d3c020d0d5c3ab6a5cc93e011ac35e7d48 upstream.
If we fail to commit an entity, we need to restore the UVC_CTRL_DATA_BACKUP for the other uncommitted entities. Otherwise the control cache and the device would be out of sync.
Message-ID: <[email protected]>
--- drivers/media/usb/uvc/uvc_ctrl.c | 42 ++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 14 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +28 -14
@@ -1577,7 +1577,7 @@ static int uvc_ctrl_commit_entity(structunsigned int processed_ctrls =0 ;struct uvc_control *ctrl;unsigned int i; -int ret; +int ret =0 ;if (entity ==NULL )return 0 ;
@@ -1605,8 +1605,6 @@ static int uvc_ctrl_commit_entity(struct dev->intfnum, ctrl->info.selector,uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT ), ctrl->info.size); - else - ret =0 ;if (!ret) processed_ctrls++;
@@ -1618,14 +1616,22 @@ static int uvc_ctrl_commit_entity(struct ctrl->dirty =0 ; -if (ret <0 ) -return ret; - -if (!rollback && handle && +if (!rollback && handle && !ret && ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS )uvc_ctrl_set_handle (handle, ctrl, handle); + +if (ret <0 && !rollback) { +/* +* If we fail to set a control, we need to rollback +* the next ones. +*/ + rollback =1 ; + } } +if (ret) +return ret; +return processed_ctrls; }
@@ -1635,23 +1641,31 @@ int __uvc_ctrl_commit(struct uvc_fh *han {struct uvc_video_chain *chain = handle->chain;struct uvc_entity *entity; -int ret =0 ; +int ret_out =0 ; +int ret;/* Find the control. */ list_for_each_entry (entity, &chain->entities, chain) { ret =uvc_ctrl_commit_entity (chain->dev, handle, entity, rollback); -if (ret <0 ) - goto done; -else if (ret >0 && !rollback) +if (ret <0 ) { +/* +* When we fail to commit an entity, we need to +* restore the UVC_CTRL_DATA_BACKUP for all the +* controls in the other entities, otherwise our cache +* and the hardware will be out of sync. +*/ + rollback =1 ; + + ret_out = ret; + }else if (ret >0 && !rollback) {uvc_ctrl_send_events (handle, entity, xctrls, xctrls_count); + } } - ret =0 ; -done:mutex_unlock (&chain->ctrl_mutex); -return ret; +return ret_out; } int uvc_ctrl_get(struct uvc_video_chain *chain,
Greg Kroah-Hartman
maintainerPATCH 105/148 staging: rtl8723bs: Avoid memset() in aes_cipher() and aes_decipher()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit a55bc4ffc06d8c965a7d6f0a01ed0ed41380df28 upstream.
After commit 6f110a5e4f99 ("Disable SLUB_TINY for build testing"), which causes CONFIG_KASAN to be enabled in allmodconfig again, arm64 allmodconfig builds with older versions of clang (15 through 17) show an instance of -Wframe-larger-than (which breaks the build with CONFIG_WERROR=y):
drivers/staging/rtl8723bs/core/rtw_security.c:1287:5: error: stack frame size (2208) exceeds limit (2048) in 'rtw_aes_decrypt' [-Werror,-Wframe-larger-than]
1287 | u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
| ^
This comes from aes_decipher() being inlined in rtw_aes_decrypt(). Running the same build with CONFIG_FRAME_WARN=128 shows aes_cipher() also uses a decent amount of stack, just under the limit of 2048:
drivers/staging/rtl8723bs/core/rtw_security.c:864:19: warning: stack frame size (1952) exceeds limit (128) in 'aes_cipher' [-Wframe-larger-than]
864 | static signed int aes_cipher(u8 *key, uint hdrlen,
| ^
-Rpass-analysis=stack-frame-layout only shows one large structure on the stack, which is the ctx variable inlined from aes128k128d(). A good number of the other variables come from the additional checks of fortified string routines, which are present in memset(), which both aes_cipher() and aes_decipher() use to initialize some temporary buffers. In this case, since the size is known at compile time, these additional checks should not result in any code generation changes but allmodconfig has several sanitizers enabled, which may make it harder for the compiler to eliminate the compile time checks and the variables that come about from them.
The memset() calls are just initializing these buffers to zero, so use '= {}' instead, which is used all over the kernel and does the exact same thing as memset() without the fortify checks, which drops the stack usage of these functions by a few hundred kilobytes.
drivers/staging/rtl8723bs/core/rtw_security.c:864:19: warning: stack frame size (1584) exceeds limit (128) in 'aes_cipher' [-Wframe-larger-than]
864 | static signed int aes_cipher(u8 *key, uint hdrlen,
| ^
drivers/staging/rtl8723bs/core/rtw_security.c:1271:5: warning: stack frame size (1456) exceeds limit (128) in 'rtw_aes_decrypt' [-Wframe-larger-than]
1271 | u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
| ^
--- drivers/staging/rtl8723bs/core/rtw_security.c | 46 +++++++------------------- 1 file changed, 14 insertions(+), 32 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +14 -32
@@ -1333,30 +1333,21 @@ static sint aes_cipher(u8 *key, uint hdr num_blocks, payload_index;u8 pn_vector[6 ]; -u8 mic_iv[16 ]; -u8 mic_header1[16 ]; -u8 mic_header2[16 ]; -u8 ctr_preload[16 ]; +u8 mic_iv[16 ] = {}; +u8 mic_header1[16 ] = {}; +u8 mic_header2[16 ] = {}; +u8 ctr_preload[16 ] = {};/* Intermediate Buffers */ -u8 chain_buffer[16 ]; -u8 aes_out[16 ]; -u8 padded_buffer[16 ]; +u8 chain_buffer[16 ] = {}; +u8 aes_out[16 ] = {}; +u8 padded_buffer[16 ] = {};u8 mic[8 ];uint frtype =GetFrameType (pframe);uint frsubtype =GetFrameSubType (pframe); frsubtype = frsubtype>>4 ; - -memset ((void *)mic_iv,0 ,16 ); -memset ((void *)mic_header1,0 ,16 ); -memset ((void *)mic_header2,0 ,16 ); -memset ((void *)ctr_preload,0 ,16 ); -memset ((void *)chain_buffer,0 ,16 ); -memset ((void *)aes_out,0 ,16 ); -memset ((void *)padded_buffer,0 ,16 ); -if ((hdrlen ==WLAN_HDR_A3_LEN ) || (hdrlen ==WLAN_HDR_A3_QOS_LEN )) a4_exists =0 ;else
@@ -1581,15 +1572,15 @@ static sint aes_decipher(u8 *key, uint h num_blocks, payload_index;sint res = _SUCCESS;u8 pn_vector[6 ]; -u8 mic_iv[16 ]; -u8 mic_header1[16 ]; -u8 mic_header2[16 ]; -u8 ctr_preload[16 ]; +u8 mic_iv[16 ] = {}; +u8 mic_header1[16 ] = {}; +u8 mic_header2[16 ] = {}; +u8 ctr_preload[16 ] = {};/* Intermediate Buffers */ -u8 chain_buffer[16 ]; -u8 aes_out[16 ]; -u8 padded_buffer[16 ]; +u8 chain_buffer[16 ] = {}; +u8 aes_out[16 ] = {}; +u8 padded_buffer[16 ] = {};u8 mic[8 ];
@@ -1599,15 +1590,6 @@ static sint aes_decipher(u8 *key, uint h frsubtype = frsubtype>>4 ; - -memset ((void *)mic_iv,0 ,16 ); -memset ((void *)mic_header1,0 ,16 ); -memset ((void *)mic_header2,0 ,16 ); -memset ((void *)ctr_preload,0 ,16 ); -memset ((void *)chain_buffer,0 ,16 ); -memset ((void *)aes_out,0 ,16 ); -memset ((void *)padded_buffer,0 ,16 ); -/* start to decrypt the payload */ num_blocks = (plen-8 ) /16 ;/* plen including LLC, payload_length and mic) */
Greg Kroah-Hartman
maintainerPATCH 106/148 drm/exynos: exynos7_drm_decon: add vblank check in IRQ handling
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kaustabh Chakraborty <[email protected]>
commit b846350aa272de99bf6fecfa6b08e64ebfb13173 upstream.
If there's support for another console device (such as a TTY serial), the kernel occasionally panics during boot. The panic message and a relevant snippet of the call stack is as follows:
Unable to handle kernel NULL pointer dereference at virtual address 000000000000000
Call trace:
drm_crtc_handle_vblank+0x10/0x30 (P)
decon_irq_handler+0x88/0xb4
[...]Otherwise, the panics don't happen. This indicates that it's some sort of race condition.
Add a check to validate if the drm device can handle vblanks before calling drm_crtc_handle_vblank() to avoid this.
--- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/exynos/exynos7_drm_decon.c +4 -0
@@ -595,6 +595,10 @@ static irqreturn_t decon_irq_handler(intif (!ctx->drm_dev) goto out; +/* check if crtc and vblank have been initialized properly */ +if (!drm_dev_has_vblank (ctx->drm_dev)) + goto out; +if (!ctx->i80_if) {drm_crtc_handle_vblank (&ctx->crtc->base);
Greg Kroah-Hartman
maintainerPATCH 107/148 proc: Clear the pieces of proc_inode that proc_evict_inode cares about
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric W. Biederman <[email protected]>
[ Upstream commit 71448011ea2a1cd36d8f5cbdab0ed716c454d565 ]
This just keeps everything tidier, and allows for using flags like SLAB_TYPESAFE_BY_RCU where slabs are not always cleared before reuse. I don't see reuse without reinitializing happening with the proc_inode but I had a false alarm while reworking flushing of proc dentries and indoes when a process dies that caused me to tidy this up.
The code is a little easier to follow and reason about this way so I figured the changes might as well be kept.
Stable-dep-of: b969f9614885 ("fix proc_sys_compare() handling of in-lookup dentries")
--- fs/proc/inode.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
fs/proc/inode.c +11 -5
@@ -33,21 +33,27 @@ static void proc_evict_inode(struct inode *inode) {struct proc_dir_entry *de;struct ctl_table_header *head; +struct proc_inode *ei =PROC_I (inode);truncate_inode_pages_final (&inode->i_data);clear_inode (inode);/* Stop tracking associated processes */ -put_pid (PROC_I (inode)->pid); +if (ei->pid) { +put_pid (ei->pid); + ei->pid =NULL ; + }/* Let go of any associated proc directory entry */ - de =PDE (inode); -if (de) + de = ei->pde; +if (de) {pde_put (de); + ei->pde =NULL ; + } - head =PROC_I (inode)->sysctl; + head = ei->sysctl;if (head) { -RCU_INIT_POINTER (PROC_I (inode)->sysctl,NULL ); +RCU_INIT_POINTER (ei->sysctl,NULL );proc_sys_evict_inode (inode, head); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 108/148 fix proc_sys_compare() handling of in-lookup dentries
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit b969f9614885c20f903e1d1f9445611daf161d6d ]
There's one case where ->d_compare() can be called for an in-lookup dentry; usually that's nothing special from ->d_compare() point of view, but... proc_sys_compare() is weird.
The thing is, /proc/sys subdirectories can look differently for different processes. Up to and including having the same name resolve to different dentries - all of them hashed.
The way it's done is ->d_compare() refusing to admit a match unless this dentry is supposed to be visible to this caller. The information needed to discriminate between them is stored in inode; it is set during proc_sys_lookup() and until it's done d_splice_alias() we really can't tell who should that dentry be visible for.
Normally there's no negative dentries in /proc/sys; we can run into a dying dentry in RCU dcache lookup, but those can be safely rejected.
However, ->d_compare() is also called for in-lookup dentries, before they get positive - or hashed, for that matter. In case of match we will wait until dentry leaves in-lookup state and repeat ->d_compare() afterwards. In other words, the right behaviour is to treat the name match as sufficient for in-lookup dentries; if dentry is not for us, we'll see that when we recheck once proc_sys_lookup() is done with it.
While we are at it, fix the misspelled READ_ONCE and WRITE_ONCE there.
--- fs/proc/inode.c | 2 +- fs/proc/proc_sysctl.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-)
fs/proc/inode.c +1 -1
@@ -53,7 +53,7 @@ static void proc_evict_inode(struct inode *inode) head = ei->sysctl;if (head) { -RCU_INIT_POINTER (ei->sysctl,NULL ); +WRITE_ONCE (ei->sysctl,NULL );proc_sys_evict_inode (inode, head); } }
fs/proc/proc_sysctl.c +11 -7
@@ -928,17 +928,21 @@ static int proc_sys_compare(const struct dentry *dentry,struct ctl_table_header *head;struct inode *inode; -/* Although proc doesn't have negative dentries, rcu-walk means -* that inode here can be NULL */ -/* AV: can it, indeed? */ - inode =d_inode_rcu (dentry); -if (!inode) -return 1 ;if (name->len != len)return 1 ;if (memcmp (name->name, str, len))return 1 ; - head =rcu_dereference (PROC_I (inode)->sysctl); + +// false positive is fine here - we'll recheck anyway +if (d_in_lookup (dentry)) +return 0 ; + + inode =d_inode_rcu (dentry); +// we just might have run into dentry in the middle of __dentry_kill() +if (!inode) +return 1 ; + + head =READ_ONCE (PROC_I (inode)->sysctl);return !head || !sysctl_is_seen (head); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 109/148 netlink: Fix wraparounds of sk->sk_rmem_alloc.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit ae8f160e7eb24240a2a79fc4c815c6a0d4ee16cc ]
Netlink has this pattern in some places
if (atomic_read(&sk->sk_rmem_alloc) > sk->sk_rcvbuf) atomic_add(skb->truesize, &sk->sk_rmem_alloc);
, which has the same problem fixed by commit 5a465a0da13e ("udp:
Fix multiple wraparounds of sk->sk_rmem_alloc.").
For example, if we set INT_MAX to SO_RCVBUFFORCE, the condition is always false as the two operands are of int.
Then, a single socket can eat as many skb as possible until OOM happens, and we can see multiple wraparounds of sk->sk_rmem_alloc.
Let's fix it by using atomic_add_return() and comparing the two variables as unsigned int.
Before:
[root@fedora ~]# ss -f netlink
Recv-Q Send-Q Local Address:Port Peer Address:Port
-1668710080 0 rtnl:nl_wraparound/293 *
After:
[root@fedora ~]# ss -f netlink
Recv-Q Send-Q Local Address:Port Peer Address:Port
2147483072 0 rtnl:nl_wraparound/290 *
^
`--- INT_MAX - 576
--- net/netlink/af_netlink.c | 81 ++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 32 deletions(-)
net/netlink/af_netlink.c +49 -32
@@ -378,7 +378,6 @@ static void netlink_skb_set_owner_r(struct sk_buff *skb, struct sock *sk)WARN_ON (skb->sk !=NULL ); skb->sk = sk; skb->destructor = netlink_skb_destructor; -atomic_add (skb->truesize, &sk->sk_rmem_alloc);sk_mem_charge (sk, skb->truesize); }
@@ -1206,41 +1205,48 @@ static struct sk_buff *netlink_alloc_large_skb(unsigned int size,int netlink_attachskb (struct sock *sk,struct sk_buff *skb,long *timeo,struct sock *ssk) { +DECLARE_WAITQUEUE (wait, current);struct netlink_sock *nlk; +unsigned int rmem; nlk =nlk_sk (sk); + rmem =atomic_add_return (skb->truesize, &sk->sk_rmem_alloc); -if ((atomic_read (&sk->sk_rmem_alloc) > sk->sk_rcvbuf || -test_bit (NETLINK_S_CONGESTED , &nlk->state))) { -DECLARE_WAITQUEUE (wait, current); -if (!*timeo) { -if (!ssk ||netlink_is_kernel (ssk)) -netlink_overrun (sk); -sock_put (sk); -kfree_skb (skb); -return -EAGAIN ; - } - -__set_current_state (TASK_INTERRUPTIBLE ); -add_wait_queue (&nlk->wait, &wait); +if ((rmem == skb->truesize || rmem <READ_ONCE (sk->sk_rcvbuf)) && + !test_bit (NETLINK_S_CONGESTED , &nlk->state)) { +netlink_skb_set_owner_r (skb, sk); +return 0 ; + } -if ((atomic_read (&sk->sk_rmem_alloc) > sk->sk_rcvbuf || -test_bit (NETLINK_S_CONGESTED , &nlk->state)) && - !sock_flag (sk,SOCK_DEAD )) - *timeo =schedule_timeout (*timeo); +atomic_sub (skb->truesize, &sk->sk_rmem_alloc); -__set_current_state (TASK_RUNNING ); -remove_wait_queue (&nlk->wait, &wait); +if (!*timeo) { +if (!ssk ||netlink_is_kernel (ssk)) +netlink_overrun (sk);sock_put (sk); +kfree_skb (skb); +return -EAGAIN ; + } -if (signal_pending (current)) { -kfree_skb (skb); -return sock_intr_errno (*timeo); - } -return 1 ; +__set_current_state (TASK_INTERRUPTIBLE ); +add_wait_queue (&nlk->wait, &wait); + rmem =atomic_read (&sk->sk_rmem_alloc); + +if (((rmem && rmem + skb->truesize >READ_ONCE (sk->sk_rcvbuf)) || +test_bit (NETLINK_S_CONGESTED , &nlk->state)) && + !sock_flag (sk,SOCK_DEAD )) + *timeo =schedule_timeout (*timeo); + +__set_current_state (TASK_RUNNING ); +remove_wait_queue (&nlk->wait, &wait); +sock_put (sk); + +if (signal_pending (current)) { +kfree_skb (skb); +return sock_intr_errno (*timeo); } -netlink_skb_set_owner_r (skb, sk); -return 0 ; + +return 1 ; }static int __netlink_sendskb (struct sock *sk,struct sk_buff *skb)
@@ -1300,6 +1306,7 @@ static int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb, ret = -ECONNREFUSED ;if (nlk->netlink_rcv !=NULL ) { ret = skb->len; +atomic_add (skb->truesize, &sk->sk_rmem_alloc);netlink_skb_set_owner_r (skb, sk);NETLINK_CB (skb).sk = ssk;netlink_deliver_tap_kernel (sk, ssk, skb);
@@ -1378,13 +1385,19 @@ EXPORT_SYMBOL_GPL(netlink_strict_get_check);static int netlink_broadcast_deliver (struct sock *sk,struct sk_buff *skb) {struct netlink_sock *nlk =nlk_sk (sk); +unsigned int rmem, rcvbuf; -if (atomic_read (&sk->sk_rmem_alloc) <= sk->sk_rcvbuf && + rmem =atomic_add_return (skb->truesize, &sk->sk_rmem_alloc); + rcvbuf =READ_ONCE (sk->sk_rcvbuf); + +if ((rmem != skb->truesize || rmem <= rcvbuf) && !test_bit (NETLINK_S_CONGESTED , &nlk->state)) {netlink_skb_set_owner_r (skb, sk);__netlink_sendskb (sk, skb); -return atomic_read (&sk->sk_rmem_alloc) > (sk->sk_rcvbuf >>1 ); +return rmem > (rcvbuf >>1 ); } + +atomic_sub (skb->truesize, &sk->sk_rmem_alloc);return -1 ; }
@@ -2177,6 +2190,7 @@ static int netlink_dump(struct sock *sk)struct module *module;int err = -ENOBUFS ;int alloc_min_size; +unsigned int rmem;int alloc_size;mutex_lock (nlk->cb_mutex);
@@ -2185,9 +2199,6 @@ static int netlink_dump(struct sock *sk) goto errout_skb; } -if (atomic_read (&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) - goto errout_skb; -/* NLMSG_GOODSIZE is small to avoid high order allocations being * required, but it makes sense to _attempt_ a 16K bytes allocation * to reduce number of system calls on dump operations, if user
@@ -2209,6 +2220,12 @@ static int netlink_dump(struct sock *sk)if (!skb) goto errout_skb; + rmem =atomic_add_return (skb->truesize, &sk->sk_rmem_alloc); +if (rmem >=READ_ONCE (sk->sk_rcvbuf)) { +atomic_sub (skb->truesize, &sk->sk_rmem_alloc); + goto errout_skb; + } +/* Trim skb to allocated size. User is expected to provide buffer as * large as max(min_dump_alloc, 16KiB (mac_recvmsg_len capped at * netlink_recvmsg())). dump will pack as many smaller messages as
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 100/148 usb: typec: displayport: Fix potential deadlock
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Kuchynski <[email protected]>
commit 099cf1fbb8afc3771f408109f62bdec66f85160e upstream.
The deadlock can occur due to a recursive lock acquisition of cros_typec_altmode_data::mutex.
The call chain is as follows:
1. cros_typec_altmode_work() acquires the mutex
2. typec_altmode_vdm() -> dp_altmode_vdm() ->
3. typec_altmode_exit() -> cros_typec_altmode_exit()
4. cros_typec_altmode_exit() attempts to acquire the mutex again
To prevent this, defer the typec_altmode_exit() call by scheduling it rather than calling it directly from within the mutex-protected context.
--- drivers/usb/typec/altmodes/displayport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/typec/altmodes/displayport.c +1 -2
@@ -289,8 +289,7 @@ static int dp_altmode_vdm(struct typec_acase CMDT_RSP_NAK :switch (cmd) {case DP_CMD_STATUS_UPDATE : -if (typec_altmode_exit (alt)) -dev_err (&dp->alt->dev,"Exit Mode Failed!\n" ); + dp->state =DP_STATE_EXIT ;break ;case DP_CMD_CONFIGURE : dp->data.conf =0 ;
Greg Kroah-Hartman
maintainerPATCH 135/148 md/raid1: Fix stack memory use after return in raid1_reshape
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Jinchao <[email protected]>
[ Upstream commit d67ed2ccd2d1dcfda9292c0ea8697a9d0f2f0d98 ]
In the raid1_reshape function, newpool is allocated on the stack and assigned to conf->r1bio_pool. This results in conf->r1bio_pool.wait.head pointing to a stack address.
Accessing this address later can lead to a kernel panic.
Example access path:
raid1_reshape()
{
// newpool is on the stack
mempool_t newpool, oldpool;
// initialize newpool.wait.head to stack address
mempool_init(&newpool, ...);
conf->r1bio_pool = newpool;
}raid1_read_request() or raid1_write_request()
{
alloc_r1bio()
{
mempool_alloc()
{
// if pool->alloc fails
remove_element()
{
--pool->curr_nr;
}
}
}
}mempool_free()
{
if (pool->curr_nr < pool->min_nr) {
// pool->wait.head is a stack address
// wake_up() will try to access this invalid address
// which leads to a kernel panic
return;
wake_up(&pool->wait);
}
}Fix:
reinit conf->r1bio_pool.wait after assigning newpool.
--- drivers/md/raid1.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/raid1.c +1 -0
@@ -3307,6 +3307,7 @@ static int raid1_reshape(struct mddev *mddev)/* ok, everything is stopped */ oldpool = conf->r1bio_pool; conf->r1bio_pool = newpool; +init_waitqueue_head (&conf->r1bio_pool.wait);for (d = d2 =0 ; d < conf->raid_disks; d++) {struct md_rdev *rdev = conf->mirrors[d].rdev;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 144/148 HID: Add IGNORE quirk for SMARTLINKTECHNOLOGY
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Heng <[email protected]>
[ Upstream commit 1a8953f4f7746c6a515989774fe03047c522c613 ]
MARTLINKTECHNOLOGY is a microphone device, when the HID interface in an audio device is requested to get specific report id, the following error may occur.
[ 562.939373] usb 1-1.4.1.2: new full-speed USB device number 21 using xhci_hcd [ 563.104908] usb 1-1.4.1.2: New USB device found, idVendor=4c4a, idProduct=4155, bcdDevice= 1.00 [ 563.104910] usb 1-1.4.1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 563.104911] usb 1-1.4.1.2: Product: USB Composite Device [ 563.104912] usb 1-1.4.1.2: Manufacturer: SmartlinkTechnology [ 563.104913] usb 1-1.4.1.2: SerialNumber: 20201111000001 [ 563.229499] input: SmartlinkTechnology USB Composite Device as /devices/pci0000:00/0000:00:07.1/0000:04:00.3/usb1/1-1/1-1.4/1-1.4.1/1-1.4.1.2/1-1.4.1.2:1.2/0003:4C4A:4155.000F/input/input35 [ 563.291505] hid-generic 0003:4C4A:4155.000F: input,hidraw2: USB HID v2.01 Keyboard [SmartlinkTechnology USB Composite Device] on usb-0000:04:00.3-1.4.1.2/input2 [ 563.291557] usbhid 1-1.4.1.2:1.3: couldn't find an input interrupt endpoint [ 568.506654] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 573.626656] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 578.746657] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 583.866655] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 588.986657] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110)
Ignore HID interface. The device is working properly.
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-quirks.c | 1 + 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -1347,4 +1347,7 @@#define USB_VENDOR_ID_SIGNOTEC 0x2133#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 +#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a +#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155 +#endif
drivers/hid/hid-quirks.c +1 -0
@@ -879,6 +879,7 @@ static const struct hid_device_id hid_ignore_list[] = {#endif { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) }, { } };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 145/148 HID: quirks: Add quirk for 2 Chicony Electronics HP 5MP Cameras
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chia-Lin Kao (AceLan) <[email protected]>
[ Upstream commit 54bae4c17c11688339eb73a04fd24203bb6e7494 ]
The Chicony Electronics HP 5MP Cameras (USB ID 04F2:B824 & 04F2:B82C) report a HID sensor interface that is not actually implemented. Attempting to access this non-functional sensor via iio_info causes system hangs as runtime PM tries to wake up an unresponsive sensor.
Add these 2 devices to the HID ignore list since the sensor interface is non-functional by design and should not be exposed to userspace.
--- drivers/hid/hid-ids.h | 2 ++ drivers/hid/hid-quirks.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +2 -0
@@ -280,6 +280,8 @@#define USB_DEVICE_ID_ASUS_AK1D 0x1125#define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A 0x1408#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12 0x1421 +#define USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA 0xb824 +#define USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA2 0xb82c#define USB_VENDOR_ID_CHUNGHWAT 0x2247#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001
drivers/hid/hid-quirks.c +2 -0
@@ -732,6 +732,8 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) }, { HID_USB_DEVICE(USB_VENDOR_ID_AXENTIA, USB_DEVICE_ID_AXENTIA_FM_RADIO) }, { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI4713) },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 146/148 Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 9cf6e24c9fbf17e52de9fff07f12be7565ea6d61 upstream.
After commit 936e4d49ecbc ("Input: atkbd - skip ATKBD_CMD_GETID in translated mode") not only the getid command is skipped, but also the de-activating of the keyboard at the end of atkbd_probe(), potentially re-introducing the problem fixed by commit be2d7e4233a4 ("Input: atkbd - fix multi-byte scancode handling on reconnect").
Make sure multi-byte scancode handling on reconnect is still handled correctly by not skipping the atkbd_deactivate() call.
--- drivers/input/keyboard/atkbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/keyboard/atkbd.c +2 -1
@@ -776,7 +776,7 @@ static int atkbd_probe(struct atkbd *atkif (atkbd_skip_getid (atkbd)) { atkbd->id =0xab83 ; -return 0 ; + goto deactivate_kbd; }/*
@@ -813,6 +813,7 @@ static int atkbd_probe(struct atkbd *atkreturn -1 ; } +deactivate_kbd:/* * Make sure nothing is coming from the keyboard and disturbs our * internal state.
Greg Kroah-Hartman
maintainerPATCH 147/148 x86/mm: Disable hugetlb page table sharing on 32-bit
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit 76303ee8d54bff6d9a6d55997acd88a6c2ba63cf upstream.
Only select ARCH_WANT_HUGE_PMD_SHARE on 64-bit x86.
Page table sharing requires at least three levels because it involves shared references to PMD tables; 32-bit x86 has either two-level paging (without PAE) or three-level paging (with PAE), but even with three-level paging, having a dedicated PGD entry for hugetlb is only barely possible (because the PGD only has four entries), and it seems unlikely anyone's actually using PMD sharing on 32-bit.
Having ARCH_WANT_HUGE_PMD_SHARE enabled on non-PAE 32-bit X86 (which has 2-level paging) became particularly problematic after commit 59d9094df3d7 ("mm: hugetlb: independent PMD page table shared count"), since that changes struct ptdesc such that the pt_mm (for PGDs) and the pt_share_count (for PMDs) share the same union storage - and with 2-level paging, PMDs are PGDs.
(For comparison, arm64 also gates ARCH_WANT_HUGE_PMD_SHARE on the configuration of page tables such that it is never enabled with 2-level paging.)
--- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +1 -1
@@ -95,7 +95,7 @@ config X86 select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH select ARCH_WANTS_DYNAMIC_TASK_STRUCT - select ARCH_WANT_HUGE_PMD_SHARE + select ARCH_WANT_HUGE_PMD_SHARE if X86_64 select ARCH_WANTS_THP_SWAP if X86_64 select BUILDTIME_EXTABLE_SORT select CLKEVT_I8253
Greg Kroah-Hartman
maintainerPATCH 148/148 net: ipv6: Discard next-hop MTU less than minimum link MTU
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Georg Kohmann <[email protected]>
commit 4a65dff81a04f874fa6915c7f069b4dc2c4010e4 upstream.
When a ICMPV6_PKT_TOOBIG report a next-hop MTU that is less than the IPv6 minimum link MTU, the estimated path MTU is reduced to the minimum link MTU. This behaviour breaks TAHI IPv6 Core Conformance Test v6LC4.1.6:
Packet Too Big Less than IPv6 MTU.
Referring to RFC 8201 section 4: "If a node receives a Packet Too Big message reporting a next-hop MTU that is less than the IPv6 minimum link MTU, it must discard it. A node must not reduce its estimate of the Path MTU below the IPv6 minimum link MTU on receipt of a Packet Too Big message."
Drop the path MTU update if reported MTU is less than the minimum link MTU.
--- net/ipv6/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/route.c +2 -1
@@ -2765,7 +2765,8 @@ static void __ip6_rt_update_pmtu(structif (confirm_neigh)dst_confirm_neigh (dst, daddr); - mtu =max_t (u32, mtu,IPV6_MIN_MTU ); +if (mtu <IPV6_MIN_MTU ) +return ;if (mtu >=dst_mtu (dst))return ;
Greg Kroah-Hartman
maintainerPATCH 136/148 net: appletalk: Fix device refcount leak in atrtr_create()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kito Xu <[email protected]>
[ Upstream commit 711c80f7d8b163d3ecd463cd96f07230f488e750 ]
When updating an existing route entry in atrtr_create(), the old device reference was not being released before assigning the new device, leading to a device refcount leak. Fix this by calling dev_put() to release the old device reference before holding the new one.
--- net/appletalk/ddp.c | 1 + 1 file changed, 1 insertion(+)
net/appletalk/ddp.c +1 -0
@@ -562,6 +562,7 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)/* Fill in the routing entry */ rt->target = ta->sat_addr; +dev_put (rt->dev);/* Release old device */ dev_hold (devhint); rt->dev = devhint; rt->flags = r->rt_flags;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 137/148 net: phy: microchip: limit 100M workaround to link-down events on LAN88xx
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit dd4360c0e8504f2f7639c7f5d07c93cfd6a98333 ]
Restrict the 100Mbit forced-mode workaround to link-down transitions only, to prevent repeated link reset cycles in certain configurations.
The workaround was originally introduced to improve signal reliability when switching cables between long and short distances. It temporarily forces the PHY into 10 Mbps before returning to 100 Mbps.
However, when used with autonegotiating link partners (e.g., Intel i350), executing this workaround on every link change can confuse the partner and cause constant renegotiation loops. This results in repeated link down/up transitions and the PHY never reaching a stable state.
Limit the workaround to only run during the PHY_NOLINK state. This ensures it is triggered only once per link drop, avoiding disruptive toggling while still preserving its intended effect.
Note: I am not able to reproduce the original issue that this workaround addresses. I can only confirm that 100 Mbit mode works correctly in my test setup. Based on code inspection, I assume the workaround aims to reset some internal state machine or signal block by toggling speeds. However, a PHY reset is already performed earlier in the function via phy_init_hw(), which may achieve a similar effect. Without a reproducer, I conservatively keep the workaround but restrict its conditions.
--- drivers/net/phy/microchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/microchip.c +1 -1
@@ -335,7 +335,7 @@ static void lan88xx_link_change_notify(struct phy_device *phydev)* As workaround, set to 10 before setting to 100 * at forced 100 F/H mode. */ -if (!phydev->autoneg && phydev->speed ==100 ) { +if (phydev->state ==PHY_NOLINK && !phydev->autoneg && phydev->speed ==100 ) {/* disable phy interrupt */ temp =phy_read (phydev,LAN88XX_INT_MASK ); temp &= ~LAN88XX_INT_MASK_MDINTPIN_EN_ ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 138/148 can: m_can: m_can_handle_lost_msg(): downgrade msg lost in rx message to debug level
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Nyekjaer <[email protected]>
[ Upstream commit 58805e9cbc6f6a28f35d90e740956e983a0e036e ]
Downgrade the "msg lost in rx" message to debug level, to prevent flooding the kernel log with error messages.
--- drivers/net/can/m_can/m_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/m_can/m_can.c +1 -1
@@ -520,7 +520,7 @@ static int m_can_handle_lost_msg(struct net_device *dev)struct sk_buff *skb;struct can_frame *frame; -netdev_err (dev,"msg lost in rxf0\n" ); +netdev_dbg (dev,"msg lost in rxf0\n" ); stats->rx_errors++; stats->rx_over_errors++;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 139/148 bnxt_en: Fix DCB ETS validation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shravya KN <[email protected]>
[ Upstream commit b74c2a2e9cc471e847abd87e50a2354c07e02040 ]
In bnxt_ets_validate(), the code incorrectly loops over all possible traffic classes to check and add the ETS settings. Fix it to loop over the configured traffic classes only.
The unconfigured traffic classes will default to TSA_ETS with 0 bandwidth. Looping over these unconfigured traffic classes may cause the validation to fail and trigger this error message:
"rejecting ETS config starving a TC\n"
The .ieee_setets() will then fail.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +2 -0
@@ -454,7 +454,9 @@ static int bnxt_ets_validate(struct bnxt *bp, struct ieee_ets *ets, u8 *tc)if ((ets->tc_tx_bw[i] || ets->tc_tsa[i]) && i > bp->max_tc)return -EINVAL ; + } +for (i =0 ; i < max_tc; i++) {switch (ets->tc_tsa[i]) {case IEEE_8021QAZ_TSA_STRICT :break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 140/148 bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Somnath Kotur <[email protected]>
[ Upstream commit 3cdf199d4755d477972ee87110b2aebc88b3cfad ]
When transmitting an XDP_REDIRECT packet, call dma_unmap_len_set() with the proper length instead of 0. This bug triggers this warning on a system with IOMMU enabled:
WARNING: CPU: 36 PID: 0 at drivers/iommu/dma-iommu.c:842 __iommu_dma_unmap+0x159/0x170 RIP: 0010:__iommu_dma_unmap+0x159/0x170 Code: a8 00 00 00 00 48 c7 45 b0 00 00 00 00 48 c7 45 c8 00 00 00 00 48 c7 45 a0 ff ff ff ff 4c 89 45
b8 4c 89 45 c0 e9 77 ff ff ff <0f> 0b e9 60 ff ff ff e8 8b bf 6a 00 66 66 2e 0f 1f 84 00 00 00 00
RSP: 0018:ff22d31181150c88 EFLAGS: 00010206
RAX: 0000000000002000 RBX: 00000000e13a0000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
RBP: ff22d31181150cf0 R08: ff22d31181150ca8 R09: 0000000000000000
R10: 0000000000000000 R11: ff22d311d36c9d80 R12: 0000000000001000
R13: ff13544d10645010 R14: ff22d31181150c90 R15: ff13544d0b2bac00
FS: 0000000000000000(0000) GS:ff13550908a00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00005be909dacff8 CR3: 0008000173408003 CR4: 0000000000f71ef0
PKRU: 55555554
Call Trace: <IRQ> ? show_regs+0x6d/0x80 ? __warn+0x89/0x160 ? __iommu_dma_unmap+0x159/0x170 ? report_bug+0x17e/0x1b0 ? handle_bug+0x46/0x90 ? exc_invalid_op+0x18/0x80 ? asm_exc_invalid_op+0x1b/0x20 ? __iommu_dma_unmap+0x159/0x170 ? __iommu_dma_unmap+0xb3/0x170 iommu_dma_unmap_page+0x4f/0x100 dma_unmap_page_attrs+0x52/0x220 ? srso_alias_return_thunk+0x5/0xfbef5 ? xdp_return_frame+0x2e/0xd0 bnxt_tx_int_xdp+0xdf/0x440 [bnxt_en] __bnxt_poll_work_done+0x81/0x1e0 [bnxt_en] bnxt_poll+0xd3/0x1e0 [bnxt_en]
--- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +1 -1
@@ -65,7 +65,7 @@ static void __bnxt_xmit_xdp_redirect(struct bnxt *bp, tx_buf->action =XDP_REDIRECT ; tx_buf->xdpf = xdpf;dma_unmap_addr_set (tx_buf, mapping, mapping); -dma_unmap_len_set (tx_buf, len,0 ); +dma_unmap_len_set (tx_buf, len, len); }void bnxt_tx_int_xdp (struct bnxt *bp,struct bnxt_napi *bnapi,int nr_pkts)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 141/148 atm: idt77252: Add missing `dma_map_error()`
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit c4890963350dcf4e9a909bae23665921fba4ad27 ]
The DMA map functions can fail and should be tested for errors.
--- drivers/atm/idt77252.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/atm/idt77252.c +5 -0
@@ -849,6 +849,8 @@ queue_skb(struct idt77252_dev *card, struct vc_map *vc,IDT77252_PRV_PADDR (skb) =dma_map_single (&card->pcidev->dev, skb->data, skb->len,DMA_TO_DEVICE ); +if (dma_mapping_error (&card->pcidev->dev,IDT77252_PRV_PADDR (skb))) +return -ENOMEM ; error = -EINVAL ;
@@ -1862,6 +1864,8 @@ add_rx_skb(struct idt77252_dev *card, int queue, paddr =dma_map_single (&card->pcidev->dev, skb->data,skb_end_pointer (skb) - skb->data,DMA_FROM_DEVICE ); +if (dma_mapping_error (&card->pcidev->dev, paddr)) + goto outpoolrm;IDT77252_PRV_PADDR (skb) = paddr;if (push_rx_skb (card, skb, queue)) {
@@ -1876,6 +1880,7 @@ add_rx_skb(struct idt77252_dev *card, int queue,dma_unmap_single (&card->pcidev->dev,IDT77252_PRV_PADDR (skb),skb_end_pointer (skb) - skb->data,DMA_FROM_DEVICE ); +outpoolrm: handle =IDT77252_PRV_POOL (skb); card->sbpool[POOL_QUEUE (handle)].skb[POOL_INDEX (handle)] =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 142/148 net: usb: qmi_wwan: add SIMCom 8230C composition
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaowei Li <[email protected]>
[ Upstream commit 0b39b055b5b48cbbdf5746a1ca6e3f6b0221e537 ]
Add support for SIMCom 8230C which is based on Qualcomm SDX35 chip. 0x9071: tty (DM) + tty (NMEA) + tty (AT) + rmnet
T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=02 Dev#= 8 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1e0e ProdID=9071 Rev= 5.15 S: Manufacturer=SIMCOM S: Product=SDXBAAGHA-IDP _SN:D744C4C5 S: SerialNumber=0123456789ABCDEF C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=86(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=none E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1382,6 +1382,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ + {QMI_QUIRK_SET_DTR(0x1e0e, 0x9071, 3)}, /* SIMCom 8230C ++ */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 143/148 vt: add missing notification when switching back to text mode
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Pitre <[email protected]>
[ Upstream commit ff78538e07fa284ce08cbbcb0730daa91ed16722 ]
Programs using poll() on /dev/vcsa to be notified when VT changes occur were missing one case: the switch from gfx to text mode.
--- drivers/tty/vt/vt.c | 1 + 1 file changed, 1 insertion(+)
drivers/tty/vt/vt.c +1 -0
@@ -4368,6 +4368,7 @@ void do_unblank_screen(int leaving_gfx)set_palette (vc);set_cursor (vc);vt_event_post (VT_EVENT_UNBLANK , vc->vc_num, vc->vc_num); +notify_update (vc); }EXPORT_SYMBOL (do_unblank_screen);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 134/148 wifi: zd1211rw: Fix potential NULL pointer dereference in zd_mac_tx_to_dev()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
[ Upstream commit 74b1ec9f5d627d2bdd5e5b6f3f81c23317657023 ]
There is a potential NULL pointer dereference in zd_mac_tx_to_dev(). For example, the following is possible:
T0 T1
zd_mac_tx_to_dev()
/* len == skb_queue_len(q) */
while (len > ZD_MAC_MAX_ACK_WAITERS) {
filter_ack()
spin_lock_irqsave(&q->lock, flags);
/* position == skb_queue_len(q) */
for (i=1; i<position; i++)
skb = __skb_dequeue(q)
if (mac->type == NL80211_IFTYPE_AP)
skb = __skb_dequeue(q);
spin_unlock_irqrestore(&q->lock, flags);
skb_dequeue() -> NULLSince there is a small gap between checking skb queue length and skb being unconditionally dequeued in zd_mac_tx_to_dev(), skb_dequeue() can return NULL. Then the pointer is passed to zd_mac_tx_status() where it is dereferenced.
In order to avoid potential NULL pointer dereference due to situations like above, check if skb is not NULL before passing it to zd_mac_tx_status().
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/zydas/zd1211rw/zd_mac.c +5 -1
@@ -584,7 +584,11 @@ void zd_mac_tx_to_dev(struct sk_buff *skb, int error)skb_queue_tail (q, skb);while (skb_queue_len (q) >ZD_MAC_MAX_ACK_WAITERS ) { -zd_mac_tx_status (hw,skb_dequeue (q), + skb =skb_dequeue (q); +if (!skb) +break ; + +zd_mac_tx_status (hw, skb, mac->ack_pending ? mac->ack_signal :0 ,NULL ); mac->ack_pending =0 ;
Signature · 1 line
2.39.5
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.296 release. There are 148 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 Thu, 17 Jul 2025 13:07:32 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.296-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.4:
10 builds: 10 pass, 0 fail
24 boots: 24 pass, 0 fail
54 tests: 53 pass, 1 failLinux version: 5.4.296-rc1-g53e64469ea49
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Test failures: tegra194-p2972-0000: boot.py
Jon
Jon Hunter
maintainerHi Greg,
Quoted 26 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.296 release. There are 148 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 Thu, 17 Jul 2025 13:07:32 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.296-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.4:
10 builds: 10 pass, 0 fail 24 boots: 24 pass, 0 fail 54 tests: 53 pass, 1 fail
Quoted 7 lines
Linux version: 5.4.296-rc1-g53e64469ea49
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000:
boot.py
I am seeing the following warning ...
boot: logs: [ 7.316610] WARNING KERN ------------[ cut here ]------------
boot: logs: [ 7.321166] WARNING KERN WARNING: CPU: 6 PID: 80 at kernel/rcu/tree.c:2572 __call_rcu+0xf8/0x1c0
boot: logs: [ 7.328690] WARNING KERN Modules linked in:
boot: logs: [ 7.331710] WARNING KERN CPU: 6 PID: 80 Comm: kworker/6:1 Not tainted 5.4.296-rc1-g53e64469ea49 #1
boot: logs: [ 7.339422] WARNING KERN Hardware name: NVIDIA Jetson AGX Xavier Developer Kit (DT)
boot: logs: [ 7.345850] WARNING KERN Workqueue: events_freezable mmc_rescan
boot: logs: [ 7.350605] WARNING KERN pstate: 60c00009 (nZCv daif +PAN +UAO)
boot: logs: [ 7.355329] WARNING KERN pc : __call_rcu+0xf8/0x1c0
boot: logs: [ 7.359029] WARNING KERN lr : kfree_call_rcu+0x10/0x20
boot: logs: [ 7.362980] WARNING KERN sp : ffff800011be37c0
boot: logs: [ 7.366249] WARNING KERN x29: ffff800011be37c0 x28: ffff0003e9459800
boot: logs: [ 7.371481] WARNING KERN x27: ffff800011771000 x26: ffff0003e9473800
boot: logs: [ 7.376712] WARNING KERN x25: 0000000000000000 x24: 0000000000000001
boot: logs: [ 7.381941] WARNING KERN x23: ffff0003e9474000 x22: ffff0003eb8a3680
boot: logs: [ 7.387175] WARNING KERN x21: 0000000000000000 x20: ffff0003eb8a3680
boot: logs: [ 7.392405] WARNING KERN x19: 0000000000000020 x18: ffffffffffffffff
boot: logs: [ 7.397640] WARNING KERN x17: ffff8000116a44c8 x16: 0000acb4dd443472
boot: logs: [ 7.402876] WARNING KERN x15: 0000000000000006 x14: 0720072007200720
boot: logs: [ 7.408112] WARNING KERN x13: 0720072007200720 x12: 0720072007200720
boot: logs: [ 7.413342] WARNING KERN x11: 0720072007200720 x10: 0720072007200720
boot: logs: [ 7.418573] WARNING KERN x9 : 0000000000000000 x8 : ffff0003e9453600
boot: logs: [ 7.423800] WARNING KERN x7 : 0000000000000000 x6 : 000000000000003f
boot: logs: [ 7.429029] WARNING KERN x5 : 0000000000000040 x4 : ffff0003e9453400
boot: logs: [ 7.434257] WARNING KERN x3 : ffff0003e9474048 x2 : 0000000000000001
boot: logs: [ 7.439478] WARNING KERN x1 : 0000000000000000 x0 : 0000000000000000
boot: logs: [ 7.444706] WARNING KERN Call trace:
boot: logs: [ 7.447129] WARNING KERN __call_rcu+0xf8/0x1c0
boot: logs: [ 7.450473] WARNING KERN kfree_call_rcu+0x10/0x20
boot: logs: [ 7.454082] WARNING KERN disk_expand_part_tbl+0xb4/0xf0
boot: logs: [ 7.458199] WARNING KERN rescan_partitions+0xd0/0x310
boot: logs: [ 7.462167] WARNING KERN bdev_disk_changed+0x6c/0x80
boot: logs: [ 7.466035] WARNING KERN __blkdev_get+0x39c/0x4e0
boot: logs: [ 7.469668] WARNING KERN blkdev_get+0x24/0x160
boot: logs: [ 7.473022] WARNING KERN __device_add_disk+0x2fc/0x440
boot: logs: [ 7.477055] WARNING KERN device_add_disk+0x10/0x20
boot: logs: [ 7.480744] WARNING KERN mmc_add_disk+0x28/0xf4
boot: logs: [ 7.484188] WARNING KERN mmc_blk_probe+0x210/0x620
boot: logs: [ 7.487885] WARNING KERN mmc_bus_probe+0x1c/0x30
boot: logs: [ 7.491413] WARNING KERN really_probe+0xdc/0x450
boot: logs: [ 7.494939] WARNING KERN driver_probe_device+0x54/0xf0
boot: logs: [ 7.498971] WARNING KERN __device_attach_driver+0xac/0x110
boot: logs: [ 7.503349] WARNING KERN bus_for_each_drv+0x74/0xd0
boot: logs: [ 7.507130] WARNING KERN __device_attach+0x98/0x190
boot: logs: [ 7.510912] WARNING KERN device_initial_probe+0x10/0x20
boot: logs: [ 7.515025] WARNING KERN bus_probe_device+0x90/0xa0
boot: logs: [ 7.518797] WARNING KERN device_add+0x2e8/0x600
boot: logs: [ 7.522245] WARNING KERN mmc_add_card+0x1dc/0x2c0
boot: logs: [ 7.525855] WARNING KERN mmc_attach_mmc+0xe8/0x170
boot: logs: [ 7.529559] WARNING KERN mmc_rescan+0x248/0x3a0
boot: logs: [ 7.532990] WARNING KERN process_one_work+0x1a0/0x360
boot: logs: [ 7.536940] WARNING KERN worker_thread+0x6c/0x470
boot: logs: [ 7.540547] WARNING KERN kthread+0x148/0x150
boot: logs: [ 7.543733] WARNING KERN ret_from_fork+0x10/0x18
boot: logs: [ 7.547243] WARNING KERN ---[ end trace c908584b2d117b20 ]---
Bisect is pointing to the following commit ...
# first bad commit: [06949933ae1b2109cfef82bcdf70e3e09b4761bb] rcu: Return early if callback is not specified
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.296 release. There are 148 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 Thu, 17 Jul 2025 13:07:32 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://urldefense.com/v3/__https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.296-rc1.gz__;!!ACWV5N9M2RV99hQ! KYmQIt1MxSQ54KewmrzO5- tK5d0v5cc3EJXODGzrGg8Ycifrn8i89H6yONTvKIHXONglJrSV-Y_iIItNopP9kk0xsA$ or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
No problems were observed on x86_64 and aarch64 during our testing.
Thanks,
Alok
Greg Kroah-Hartman
maintainerQuoted 96 lines · Jon Hunter
Hi Greg,
Quoted 26 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.296 release. There are 148 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 Thu, 17 Jul 2025 13:07:32 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.296-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Failures detected for Tegra ...
Test results for stable-v5.4:
10 builds: 10 pass, 0 fail 24 boots: 24 pass, 0 fail 54 tests: 53 pass, 1 failQuoted 7 lines
Linux version: 5.4.296-rc1-g53e64469ea49
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000:
boot.pyI am seeing the following warning ...
boot: logs: [ 7.316610] WARNING KERN ------------[ cut here ]------------
boot: logs: [ 7.321166] WARNING KERN WARNING: CPU: 6 PID: 80 atkernel/rcu/tree.c:2572__call_rcu+0xf8/0x1c0
boot: logs: [ 7.328690] WARNING KERN Modules linked in:
boot: logs: [ 7.331710] WARNING KERN CPU: 6 PID: 80 Comm: kworker/6:1 Not tainted 5.4.296-rc1-g53e64469ea49 #1
boot: logs: [ 7.339422] WARNING KERN Hardware name: NVIDIA Jetson AGX Xavier Developer Kit (DT)
boot: logs: [ 7.345850] WARNING KERN Workqueue:events_freezablemmc_rescan
boot: logs: [ 7.350605] WARNING KERN pstate:60c00009(nZCv daif +PAN +UAO)
boot: logs: [ 7.355329] WARNING KERN pc :__call_rcu+0xf8/0x1c0
boot: logs: [ 7.359029] WARNING KERN lr :kfree_call_rcu+0x10/0x20
boot: logs: [ 7.362980] WARNING KERN sp :ffff800011be37c0
boot: logs: [ 7.366249] WARNING KERN x29:ffff800011be37c0x28:ffff0003e9459800
boot: logs: [ 7.371481] WARNING KERN x27:ffff800011771000x26:ffff0003e9473800
boot: logs: [ 7.376712] WARNING KERN x25: 0000000000000000 x24: 0000000000000001
boot: logs: [ 7.381941] WARNING KERN x23:ffff0003e9474000x22:ffff0003eb8a3680
boot: logs: [ 7.387175] WARNING KERN x21: 0000000000000000 x20:ffff0003eb8a3680
boot: logs: [ 7.392405] WARNING KERN x19: 0000000000000020 x18: ffffffffffffffff
boot: logs: [ 7.397640] WARNING KERN x17:ffff8000116a44c8x16:0000acb4dd443472
boot: logs: [ 7.402876] WARNING KERN x15: 0000000000000006 x14: 0720072007200720
boot: logs: [ 7.408112] WARNING KERN x13: 0720072007200720 x12: 0720072007200720
boot: logs: [ 7.413342] WARNING KERN x11: 0720072007200720 x10: 0720072007200720
boot: logs: [ 7.418573] WARNING KERN x9 : 0000000000000000 x8 :ffff0003e9453600
boot: logs: [ 7.423800] WARNING KERN x7 : 0000000000000000 x6 :000000000000003f
boot: logs: [ 7.429029] WARNING KERN x5 : 0000000000000040 x4 :ffff0003e9453400
boot: logs: [ 7.434257] WARNING KERN x3 :ffff0003e9474048x2 : 0000000000000001
boot: logs: [ 7.439478] WARNING KERN x1 : 0000000000000000 x0 : 0000000000000000
boot: logs: [ 7.444706] WARNING KERN Call trace:
boot: logs: [ 7.447129] WARNING KERN__call_rcu+0xf8/0x1c0
boot: logs: [ 7.450473] WARNING KERNkfree_call_rcu+0x10/0x20
boot: logs: [ 7.454082] WARNING KERNdisk_expand_part_tbl+0xb4/0xf0
boot: logs: [ 7.458199] WARNING KERNrescan_partitions+0xd0/0x310
boot: logs: [ 7.462167] WARNING KERNbdev_disk_changed+0x6c/0x80
boot: logs: [ 7.466035] WARNING KERN__blkdev_get+0x39c/0x4e0
boot: logs: [ 7.469668] WARNING KERNblkdev_get+0x24/0x160
boot: logs: [ 7.473022] WARNING KERN__device_add_disk+0x2fc/0x440
boot: logs: [ 7.477055] WARNING KERNdevice_add_disk+0x10/0x20
boot: logs: [ 7.480744] WARNING KERNmmc_add_disk+0x28/0xf4
boot: logs: [ 7.484188] WARNING KERNmmc_blk_probe+0x210/0x620
boot: logs: [ 7.487885] WARNING KERNmmc_bus_probe+0x1c/0x30
boot: logs: [ 7.491413] WARNING KERNreally_probe+0xdc/0x450
boot: logs: [ 7.494939] WARNING KERNdriver_probe_device+0x54/0xf0
boot: logs: [ 7.498971] WARNING KERN__device_attach_driver+0xac/0x110
boot: logs: [ 7.503349] WARNING KERNbus_for_each_drv+0x74/0xd0
boot: logs: [ 7.507130] WARNING KERN__device_attach+0x98/0x190
boot: logs: [ 7.510912] WARNING KERNdevice_initial_probe+0x10/0x20
boot: logs: [ 7.515025] WARNING KERNbus_probe_device+0x90/0xa0
boot: logs: [ 7.518797] WARNING KERNdevice_add+0x2e8/0x600
boot: logs: [ 7.522245] WARNING KERNmmc_add_card+0x1dc/0x2c0
boot: logs: [ 7.525855] WARNING KERNmmc_attach_mmc+0xe8/0x170
boot: logs: [ 7.529559] WARNING KERNmmc_rescan+0x248/0x3a0
boot: logs: [ 7.532990] WARNING KERNprocess_one_work+0x1a0/0x360
boot: logs: [ 7.536940] WARNING KERNworker_thread+0x6c/0x470
boot: logs: [ 7.540547] WARNING KERNkthread+0x148/0x150
boot: logs: [ 7.543733] WARNING KERNret_from_fork+0x10/0x18
boot: logs: [ 7.547243] WARNING KERN ---[ end tracec908584b2d117b20]---
Quoted 3 lines
Bisect is pointing to the following commit ...
# first bad commit: [06949933ae1b2109cfef82bcdf70e3e09b4761bb] rcu: Return early if callback is not specified
Thanks for this, let me go drop it and push out a new -rc.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.296 release. There are 148 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 Thu, 17 Jul 2025 13:07:32 +0000. 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/v5.x/stable-review/patch-5.4.296-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah