media: s5p_cec: limit msg.len to CEC_MAX_MSG_SIZE
Subsystems (9)
Sasha Levin
maintainerPATCH 1/8 media: s5p_cec: limit msg.len to CEC_MAX_MSG_SIZE
From: Hans Verkuil <[email protected]>
[ Upstream commit 93f65ce036863893c164ca410938e0968964b26c ]
I expect that the hardware will have limited this to 16, but just in case it hasn't, check for this corner case.
--- drivers/media/platform/s5p-cec/s5p_cec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/s5p-cec/s5p_cec.c +2 -0
@@ -115,6 +115,8 @@ static irqreturn_t s5p_cec_irq_handler(int irq, void *priv)dev_dbg (cec->dev,"Buffer overrun (worker did not process previous message)\n" ); cec->rx =STATE_BUSY ; cec->msg.len = status >>24 ; +if (cec->msg.len >CEC_MAX_MSG_SIZE ) + cec->msg.len =CEC_MAX_MSG_SIZE ; cec->msg.rx_status =CEC_RX_STATUS_OK ;s5p_cec_get_rx_buf (cec, cec->msg.len, cec->msg.msg);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 2/8 media: cros-ec-cec: limit msg.len to CEC_MAX_MSG_SIZE
From: Hans Verkuil <[email protected]>
[ Upstream commit 2dc73b48665411a08c4e5f0f823dea8510761603 ]
I expect that the hardware will have limited this to 16, but just in case it hasn't, check for this corner case.
--- drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/cros-ec-cec/cros-ec-cec.c +2 -0
@@ -45,6 +45,8 @@ static void handle_cec_message(struct cros_ec_cec *cros_ec_cec)uint8_t *cec_message = cros_ec->event_data.data.cec_message;unsigned int len = cros_ec->event_size; +if (len >CEC_MAX_MSG_SIZE ) + len =CEC_MAX_MSG_SIZE ; cros_ec_cec->rx_msg.len = len;memcpy (cros_ec_cec->rx_msg.msg, cec_message, len);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 3/8 media: dvb-frontends/drxk: initialize err to 0
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 20694e96ca089ce6693c2348f8f628ee621e4e74 ]
Fix a compiler warning:
drivers/media/dvb-frontends/drxk_hard.c: In function 'drxk_read_ucblocks':drivers/media/dvb-frontends/drxk_hard.c:6673:21: warning: 'err' may be used uninitialized [-Wmaybe-uninitialized]
6673 | *ucblocks = (u32) err;
| ^~~~~~~~~drivers/media/dvb-frontends/drxk_hard.c:6663:13: note: 'err' was declared here
6663 | u16 err;
| ^~~
--- drivers/media/dvb-frontends/drxk_hard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb-frontends/drxk_hard.c +1 -1
@@ -6684,7 +6684,7 @@ static int drxk_read_snr(struct dvb_frontend *fe, u16 *snr)static int drxk_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) {struct drxk_state *state = fe->demodulator_priv; -u16 err; +u16 err =0 ;dprintk (1 ,"\n" );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 4/8 media: meson: vdec: fix possible refcount leak in vdec_probe()
In reply to Sasha LevinFrom: Hangyu Hua <[email protected]>
[ Upstream commit 7718999356234d9cc6a11b4641bb773928f1390f ]
v4l2_device_unregister need to be called to put the refcount got by v4l2_device_register when vdec_probe fails or vdec_remove is called.
--- drivers/staging/media/meson/vdec/vdec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/media/meson/vdec/vdec.c +2 -0
@@ -1074,6 +1074,7 @@ static int vdec_probe(struct platform_device *pdev) err_vdev_release:video_device_release (vdev); +v4l2_device_unregister (&core->v4l2_dev);return ret; }
@@ -1082,6 +1083,7 @@ static int vdec_remove(struct platform_device *pdev)struct amvdec_core *core =platform_get_drvdata (pdev);video_unregister_device (core->vdev_dec); +v4l2_device_unregister (&core->v4l2_dev);return 0 ; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 5/8 hwrng: bcm2835 - use hwrng_msleep() instead of cpu_relax()
In reply to Sasha LevinFrom: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit 96cb9d0554457086664d3bd10630b11193d863f1 ]
Rather than busy looping, yield back to the scheduler and sleep for a bit in the event that there's no data. This should hopefully prevent the stalls that Mark reported:
<6>[ 3.362859] Freeing initrd memory: 16196K <3>[ 23.160131] rcu: INFO: rcu_sched self-detected stall on CPU <3>[ 23.166057] rcu: 0-....: (2099 ticks this GP) idle=03b4/1/0x40000002 softirq=28/28 fqs=1050 <4>[ 23.174895] (t=2101 jiffies g=-1147 q=2353 ncpus=4) <4>[ 23.180203] CPU: 0 PID: 49 Comm: hwrng Not tainted 6.0.0 #1 <4>[ 23.186125] Hardware name: BCM2835 <4>[ 23.189837] PC is at bcm2835_rng_read+0x30/0x6c <4>[ 23.194709] LR is at hwrng_fillfn+0x71/0xf4 <4>[ 23.199218] pc : [<c07ccdc8>] lr : [<c07cb841>] psr: 40000033 <4>[ 23.205840] sp : f093df70 ip : 00000000 fp : 00000000 <4>[ 23.211404] r10: c3c7e800 r9 : 00000000 r8 : c17e6b20 <4>[ 23.216968] r7 : c17e6b64 r6 : c18b0a74 r5 : c07ccd99 r4 : c3f171c0 <4>[ 23.223855] r3 : 000fffff r2 : 00000040 r1 : c3c7e800 r0 : c3f171c0 <4>[ 23.230743] Flags: nZcv IRQs on FIQs on Mode SVC_32 ISA Thumb Segment none <4>[ 23.238426] Control: 50c5387d Table: 0020406a DAC: 00000051 <4>[ 23.244519] CPU: 0 PID: 49 Comm: hwrng Not tainted 6.0.0 #1
--- drivers/char/hw_random/bcm2835-rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/hw_random/bcm2835-rng.c +1 -1
@@ -69,7 +69,7 @@ static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max,while ((rng_readl (priv,RNG_STATUS ) >>24 ) ==0 ) {if (!wait)return 0 ; -cpu_relax (); +hwrng_msleep (rng,1000 ); } num_words =rng_readl (priv,RNG_STATUS ) >>24 ;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 6/8 scsi: core: Restrict legal sdev_state transitions via sysfs
In reply to Sasha LevinFrom: Uday Shankar <[email protected]>
[ Upstream commit 2331ce6126be8864b39490e705286b66e2344aac ]
Userspace can currently write to sysfs to transition sdev_state to RUNNING or OFFLINE from any source state. This causes issues because proper transitioning out of some states involves steps besides just changing sdev_state, so allowing userspace to change sdev_state regardless of the source state can result in inconsistencies; e.g. with ISCSI we can end up with sdev_state == SDEV_RUNNING while the device queue is quiesced. Any task attempting I/O on the device will then hang, and in more recent kernels, iscsid will hang as well.
More detail about this bug is provided in my first attempt:
https://groups.google.com/g/open-iscsi/c/PNKca4HgPDs/m/CXaDkntOAQAJ
--- drivers/scsi/scsi_sysfs.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/scsi/scsi_sysfs.c +8 -0
@@ -795,6 +795,14 @@ store_state_field(struct device *dev, struct device_attribute *attr, }mutex_lock (&sdev->state_mutex); +switch (sdev->sdev_state) { +case SDEV_RUNNING : +case SDEV_OFFLINE : +break ; +default : +mutex_unlock (&sdev->state_mutex); +return -EINVAL ; + }if (sdev->sdev_state ==SDEV_RUNNING && state ==SDEV_RUNNING ) { ret =0 ; }else {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 7/8 HID: saitek: add madcatz variant of MMO7 mouse device ID
In reply to Sasha LevinFrom: Samuel Bailey <[email protected]>
[ Upstream commit 79425b297f56bd481c6e97700a9a4e44c7bcfa35 ]
The MadCatz variant of the MMO7 mouse has the ID 0738:1713 and the same quirks as the Saitek variant.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hid/hid-saitek.c | 2 ++ 3 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -818,6 +818,7 @@#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540#define USB_DEVICE_ID_MADCATZ_RAT5 0x1705#define USB_DEVICE_ID_MADCATZ_RAT9 0x1709 +#define USB_DEVICE_ID_MADCATZ_MMO7 0x1713#define USB_VENDOR_ID_MCC 0x09db#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
drivers/hid/hid-quirks.c +1 -0
@@ -615,6 +615,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) }, { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT5) }, { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_MMO7) }, #endif #if IS_ENABLED(CONFIG_HID_SAMSUNG) { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
drivers/hid/hid-saitek.c +2 -0
@@ -187,6 +187,8 @@ static const struct hid_device_id saitek_devices[] = { .driver_data = SAITEK_RELEASE_MODE_RAT7 }, { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7), .driver_data = SAITEK_RELEASE_MODE_MMO7 }, + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_MMO7), + .driver_data = SAITEK_RELEASE_MODE_MMO7 }, { } };
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 8/8 i2c: xiic: Add platform module alias
In reply to Sasha LevinFrom: Martin Tůma <[email protected]>
[ Upstream commit b8caf0a0e04583fb71e21495bef84509182227ea ]
The missing "platform" alias is required for the mgb4 v4l2 driver to load the i2c controller driver when probing the HW.
--- drivers/i2c/busses/i2c-xiic.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-xiic.c +1 -0
@@ -884,6 +884,7 @@ static struct platform_driver xiic_i2c_driver = {module_platform_driver (xiic_i2c_driver); +MODULE_ALIAS ("platform:" DRIVER_NAME );MODULE_AUTHOR ("[email protected]" );MODULE_DESCRIPTION ("Xilinx I2C bus driver" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.35.1