fs/ntfs3: Mark volume as dirty if xattr is broken
Subsystems (7)
Sasha Levin
maintainerPATCH 1/4 fs/ntfs3: Mark volume as dirty if xattr is broken
From: Konstantin Komarov <[email protected]>
[ Upstream commit 24f6f5020b0b2c89c2cba5ec224547be95f753ee ]
Mark a volume as corrupted if the name length exceeds the space occupied by ea.
--- fs/ntfs3/xattr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/ntfs3/xattr.c +4 -1
@@ -219,8 +219,11 @@ static ssize_t ntfs_list_ea(struct ntfs_inode *ni, char *buffer,if (!ea->name_len)break ; -if (ea->name_len > ea_size) +if (ea->name_len > ea_size) { +ntfs_set_state (ni->mi.sbi,NTFS_DIRTY_ERROR ); + err = -EINVAL ;/* corrupted fs */ break ; + }if (buffer) {/* Check if we can use field ea->name */
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 2/4 cdrom: rearrange last_media_change check to avoid unintentional overflow
From: Justin Stitt <[email protected]>
[ Upstream commit efb905aeb44b0e99c0e6b07865b1885ae0471ebf ]
When running syzkaller with the newly reintroduced signed integer wrap sanitizer we encounter this splat:
[ 366.015950] UBSAN: signed-integer-overflow in ../drivers/cdrom/cdrom.c:2361:33 [ 366.021089] -9223372036854775808 - 346321 cannot be represented in type '__s64' (aka 'long long') [ 366.025894] program syz-executor.4 is using a deprecated SCSI ioctl, please convert it to SG_IO [ 366.027502] CPU: 5 PID: 28472 Comm: syz-executor.7 Not tainted 6.8.0-rc2-00035-gb3ef86b5a957 #1 [ 366.027512] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 366.027518] Call Trace: [ 366.027523] <TASK> [ 366.027533] dump_stack_lvl+0x93/0xd0 [ 366.027899] handle_overflow+0x171/0x1b0 [ 366.038787] ata1.00: invalid multi_count 32 ignored [ 366.043924] cdrom_ioctl+0x2c3f/0x2d10 [ 366.063932] ? __pm_runtime_resume+0xe6/0x130 [ 366.071923] sr_block_ioctl+0x15d/0x1d0 [ 366.074624] ? __pfx_sr_block_ioctl+0x10/0x10 [ 366.077642] blkdev_ioctl+0x419/0x500 [ 366.080231] ? __pfx_blkdev_ioctl+0x10/0x10
...
Historically, the signed integer overflow sanitizer did not work in the kernel due to its interaction with -fwrapv but this has since been changed [1] in the newest version of Clang. It was re-enabled in the kernel with Commit 557f8c582a9ba8ab ("ubsan: Reintroduce signed overflow sanitizer").
Let's rearrange the check to not perform any arithmetic, thus not tripping the sanitizer.
--- drivers/cdrom/cdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cdrom/cdrom.c +1 -1
@@ -2358,7 +2358,7 @@ static int cdrom_ioctl_timed_media_change(struct cdrom_device_info *cdi,return -EFAULT ; tmp_info.media_flags =0 ; -if (tmp_info.last_media_change - cdi->last_media_change_ms <0 ) +if (cdi->last_media_change_ms > tmp_info.last_media_change) tmp_info.media_flags |=MEDIA_CHANGED_FLAG ; tmp_info.last_media_change = cdi->last_media_change_ms;
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 3/4 ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897
In reply to Sasha LevinFrom: Jian-Hong Pan <[email protected]>
[ Upstream commit 45e37f9ce28d248470bab4376df2687a215d1b22 ]
JP-IK LEAP W502 laptop's headset mic is not enabled until ALC897_FIXUP_HEADSET_MIC_PIN3 quirk is applied.
Here is the original pin node values:
0x11 0x400000000x12 0xb7a601300x14 0x901701100x15 0x411111f00x16 0x411111f00x17 0x411111f00x18 0x411111f00x19 0x411111f00x1a 0x411111f00x1b 0x032110200x1c 0x411111f00x1d 0x4026892d0x1e 0x411111f00x1f 0x411111f0
--- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/pci/hda/patch_realtek.c +9 -0
@@ -11760,6 +11760,7 @@ enum {ALC897_FIXUP_LENOVO_HEADSET_MODE ,ALC897_FIXUP_HEADSET_MIC_PIN2 ,ALC897_FIXUP_UNIS_H3C_X500S , + ALC897_FIXUP_HEADSET_MIC_PIN3, }; static const struct hda_fixup alc662_fixups[] = {
@@ -12206,10 +12207,18 @@ static const struct hda_fixup alc662_fixups[] = { {} }, }, + [ALC897_FIXUP_HEADSET_MIC_PIN3 ] = { + .type =HDA_FIXUP_PINS , + .v.pins = (const struct hda_pintbl []) { + {0x19 ,0x03a11050 },/* use as headset mic */ + { } + }, + }, };static const struct snd_pci_quirk alc662_fixup_tbl[] = {SND_PCI_QUIRK (0x1019 ,0x9087 ,"ECS" ,ALC662_FIXUP_ASUS_MODE2 ), +SND_PCI_QUIRK (0x1019 ,0x9859 ,"JP-IK LEAP W502" ,ALC897_FIXUP_HEADSET_MIC_PIN3 ),SND_PCI_QUIRK (0x1025 ,0x022f ,"Acer Aspire One" ,ALC662_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1025 ,0x0241 ,"Packard Bell DOTS" ,ALC662_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1025 ,0x0308 ,"Acer Aspire 8942G" ,ALC662_FIXUP_ASPIRE ),
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 4/4 vhost-scsi: Handle vhost_vq_work_queue failures for events
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit b1b2ce58ed23c5d56e0ab299a5271ac01f95b75c ]
Currently, we can try to queue an event's work before the vhost_task is created. When this happens we just drop it in vhost_scsi_do_plug before even calling vhost_vq_work_queue. During a device shutdown we do the same thing after vhost_scsi_clear_endpoint has cleared the backends.
In the next patches we will be able to kill the vhost_task before we have cleared the endpoint. In that case, vhost_vq_work_queue can fail and we will leak the event's memory. This has handle the failure by just freeing the event. This is safe to do, because vhost_vq_work_queue will only return failure for us when the vhost_task is killed and so userspace will not be able to handle events if we sent them.
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/vhost/scsi.c +12 -5
@@ -497,10 +497,8 @@ vhost_scsi_do_evt_work(struct vhost_scsi *vs, struct vhost_scsi_evt *evt)vq_err (vq,"Faulted on vhost_scsi_send_event\n" ); } -static void vhost_scsi_evt_work (struct vhost_work *work) +static void vhost_scsi_complete_events (struct vhost_scsi *vs,bool drop) { - struct vhost_scsi *vs = container_of(work, struct vhost_scsi, - vs_event_work);struct vhost_virtqueue *vq = &vs->vqs[VHOST_SCSI_VQ_EVT ].vq;struct vhost_scsi_evt *evt, *t;struct llist_node *llnode;
@@ -508,12 +506,20 @@ static void vhost_scsi_evt_work(struct vhost_work *work)mutex_lock (&vq->mutex); llnode =llist_del_all (&vs->vs_event_list);llist_for_each_entry_safe (evt, t, llnode, list) { -vhost_scsi_do_evt_work (vs, evt); +if (!drop) +vhost_scsi_do_evt_work (vs, evt);vhost_scsi_free_evt (vs, evt); }mutex_unlock (&vq->mutex); } +static void vhost_scsi_evt_work (struct vhost_work *work) +{ + struct vhost_scsi *vs = container_of(work, struct vhost_scsi, + vs_event_work); +vhost_scsi_complete_events (vs, false); +} +static int vhost_scsi_copy_sgl_to_iov (struct vhost_scsi_cmd *cmd) {struct iov_iter *iter = &cmd->saved_iter;
@@ -1509,7 +1515,8 @@ vhost_scsi_send_evt(struct vhost_scsi *vs, struct vhost_virtqueue *vq, }llist_add (&evt->list, &vs->vs_event_list); -vhost_vq_work_queue (vq, &vs->vs_event_work); +if (!vhost_vq_work_queue (vq, &vs->vs_event_work)) +vhost_scsi_complete_events (vs, true); }static void vhost_scsi_evt_handle_kick (struct vhost_work *work)
Signature · 1 line
2.43.0