5.17.2-rc1 review
Subsystems (11)
Greg Kroah-Hartman
maintainerPATCH 1/1126 Revert "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit bddac7c1e02ba47f0570e494c9289acea3062cc1 upstream.
This reverts commit aa6f8dcbab473f3a3c7454b74caa46d36cdc5d13.
It turns out this breaks at least the ath9k wireless driver, and possibly others.
What the ath9k driver does on packet receive is to set up the DMA transfer with:
int ath_rx_init(..)
..
bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
common->rx_bufsize,
DMA_FROM_DEVICE);and then the receive logic (through ath_rx_tasklet()) will fetch incoming packets
static bool ath_edma_get_buffers(..)
..
dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
common->rx_bufsize, DMA_FROM_DEVICE);
ret = ath9k_hw_process_rxdesc_edma(ah, rs, skb->data);
if (ret == -EINPROGRESS) {
/*let device gain the buffer again*/
dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
common->rx_bufsize, DMA_FROM_DEVICE);
return false;
}and it's worth noting how that first DMA sync:
dma_sync_single_for_cpu(..DMA_FROM_DEVICE);
is there to make sure the CPU can read the DMA buffer (possibly by copying it from the bounce buffer area, or by doing some cache flush). The iommu correctly turns that into a "copy from bounce bufer" so that the driver can look at the state of the packets.
In the meantime, the device may continue to write to the DMA buffer, but we at least have a snapshot of the state due to that first DMA sync.
But that _second_ DMA sync:
dma_sync_single_for_device(..DMA_FROM_DEVICE);
is telling the DMA mapping that the CPU wasn't interested in the area because the packet wasn't there. In the case of a DMA bounce buffer, that is a no-op.
Note how it's not a sync for the CPU (the "for_device()" part), and it's not a sync for data written by the CPU (the "DMA_FROM_DEVICE" part).
Or rather, it _should_ be a no-op. That's what commit aa6f8dcbab47
broke: it made the code bounce the buffer unconditionally, and changed the DMA_FROM_DEVICE to just unconditionally and illogically be DMA_TO_DEVICE.
[ Side note: purely within the confines of the swiotlb driver it wasn't
entirely illogical: The reason it did that odd DMA_FROM_DEVICE -> DMA_TO_DEVICE conversion thing is because inside the swiotlb driver, it uses just a swiotlb_bounce() helper that doesn't care about the whole distinction of who the sync is for - only which direction to bounce.
So it took the "sync for device" to mean that the CPU must have been the one writing, and thought it meant DMA_TO_DEVICE. ]
Also note how the commentary in that commit was wrong, probably due to that whole confusion, claiming that the commit makes the swiotlb code
"bounce unconditionally (that is, also
when dir == DMA_TO_DEVICE) in order do avoid synchronising back stale data from the swiotlb buffer"
which is nonsensical for two reasons:
- that "also when dir == DMA_TO_DEVICE" is nonsensical, as that was exactly when it always did - and should do - the bounce.
- since this is a sync for the device (not for the CPU), we're clearly fundamentally not coping back stale data from the bounce buffers at all, because we'd be copying *to* the bounce buffers.
So that commit was just very confused. It confused the direction of the synchronization (to the device, not the cpu) with the direction of the DMA (from the device).
--- Documentation/core-api/dma-attributes.rst | 8 ++++++++ include/linux/dma-mapping.h | 8 ++++++++ kernel/dma/swiotlb.c | 23 ++++++++--------------- 3 files changed, 24 insertions(+), 15 deletions(-)
Documentation/core-api/dma-attributes.rst +8 -0
@@ -130,3 +130,11 @@ accesses to DMA buffers in both privileg subsystem that the buffer is fully accessible at the elevated privilege level (and ideally inaccessible or at least read-only at the lesser-privileged levels). + +DMA_ATTR_OVERWRITE +------------------ + +This is a hint to the DMA-mapping subsystem that the device is expected to +overwrite the entire mapped size, thus the caller does not require any of the +previous buffer contents to be preserved. This allows bounce-buffering +implementations to optimise DMA_FROM_DEVICE transfers.
include/linux/dma-mapping.h +8 -0
@@ -62,6 +62,14 @@#define DMA_ATTR_PRIVILEGED (1UL << 9)/* +* This is a hint to the DMA-mapping subsystem that the device is expected +* to overwrite the entire mapped size, thus the caller does not require any +* of the previous buffer contents to be preserved. This allows +* bounce-buffering implementations to optimise DMA_FROM_DEVICE transfers. +*/ +#define DMA_ATTR_OVERWRITE (1UL << 10) + +/* * A dma_addr_t can hold any valid DMA or bus address for the platform. It can * be given to a device to use as a DMA source or target. It is specific to a * given device and there may be a translation between the CPU physical address
kernel/dma/swiotlb.c +8 -15
@@ -627,14 +627,10 @@ phys_addr_t swiotlb_tbl_map_single(strucfor (i =0 ; i <nr_slots (alloc_size + offset); i++) mem->slots[index + i].orig_addr =slot_addr (orig_addr, i); tlb_addr =slot_addr (mem->start, index) + offset; -/* -* When dir == DMA_FROM_DEVICE we could omit the copy from the orig -* to the tlb buffer, if we knew for sure the device will -* overwirte the entire current content. But we don't. Thus -* unconditional bounce may prevent leaking swiotlb content (i.e. -* kernel memory) to user-space. -*/ -swiotlb_bounce (dev, tlb_addr, mapping_size,DMA_TO_DEVICE ); +if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && + (!(attrs &DMA_ATTR_OVERWRITE ) || dir ==DMA_TO_DEVICE || + dir ==DMA_BIDIRECTIONAL )) +swiotlb_bounce (dev, tlb_addr, mapping_size,DMA_TO_DEVICE );return tlb_addr; }
@@ -701,13 +697,10 @@ void swiotlb_tbl_unmap_single(struct devvoid swiotlb_sync_single_for_device (struct device *dev,phys_addr_t tlb_addr,size_t size,enum dma_data_direction dir) { -/* -* Unconditional bounce is necessary to avoid corruption on -* sync_*_for_cpu or dma_ummap_* when the device didn't overwrite -* the whole lengt of the bounce buffer. -*/ -swiotlb_bounce (dev, tlb_addr, size,DMA_TO_DEVICE ); -BUG_ON (!valid_dma_direction (dir)); +if (dir ==DMA_TO_DEVICE || dir ==DMA_BIDIRECTIONAL ) +swiotlb_bounce (dev, tlb_addr, size,DMA_TO_DEVICE ); +else +BUG_ON (dir !=DMA_FROM_DEVICE ); } void swiotlb_sync_single_for_cpu(struct device *dev, phys_addr_t tlb_addr,
Greg Kroah-Hartman
maintainerPATCH 10/1126 iommu/iova: Improve 32-bit free space estimate
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
commit 5b61343b50590fb04a3f6be2cdc4868091757262 upstream.
For various reasons based on the allocator behaviour and typical use-cases at the time, when the max32_alloc_size optimisation was introduced it seemed reasonable to couple the reset of the tracked size to the update of cached32_node upon freeing a relevant IOVA. However, since subsequent optimisations focused on helping genuine 32-bit devices make best use of even more limited address spaces, it is now a lot more likely for cached32_node to be anywhere in a "full" 32-bit address space, and as such more likely for space to become available from IOVAs below that node being freed.
At this point, the short-cut in __cached_rbnode_delete_update() really doesn't hold up any more, and we need to fix the logic to reliably provide the expected behaviour. We still want cached32_node to only move upwards, but we should reset the allocation size if *any* 32-bit space has become available.
--- drivers/iommu/iova.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/iommu/iova.c +3 -2
@@ -95,10 +95,11 @@ __cached_rbnode_delete_update(struct iov cached_iova =to_iova (iovad->cached32_node);if (free == cached_iova || (free->pfn_hi < iovad->dma_32bit_pfn && - free->pfn_lo >= cached_iova->pfn_lo)) { + free->pfn_lo >= cached_iova->pfn_lo)) iovad->cached32_node =rb_next (&free->node); + +if (free->pfn_lo < iovad->dma_32bit_pfn) iovad->max32_alloc_size = iovad->dma_32bit_pfn; - } cached_iova =to_iova (iovad->cached_node);if (free->pfn_lo >= cached_iova->pfn_lo)
Greg Kroah-Hartman
maintainerPATCH 11/1126 block: flush plug based on hardware and software queue order
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 26fed4ac4eab09c27fbae1859696cc38f0536407 upstream.
We used to sort the plug list if we had multiple queues before dispatching requests to the IO scheduler. This usually isn't needed, but for certain workloads that interleave requests to disks, it's a less efficient to process the plug list one-by-one if everything is interleaved.
Don't sort the list, but skip through it and flush out entries that have the same target at the same time.
--- block/blk-mq.c | 59 +++++++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 31 deletions(-)
block/blk-mq.c +28 -31
@@ -2561,13 +2561,36 @@ static void __blk_mq_flush_plug_list(str q->mq_ops->queue_rqs (&plug->mq_list); } +static void blk_mq_dispatch_plug_list (struct blk_plug *plug,bool from_sched) +{ +struct blk_mq_hw_ctx *this_hctx =NULL ; +struct blk_mq_ctx *this_ctx =NULL ; +struct request *requeue_list =NULL ; +unsigned int depth =0 ; +LIST_HEAD (list); + +do { +struct request *rq =rq_list_pop (&plug->mq_list); + +if (!this_hctx) { + this_hctx = rq->mq_hctx; + this_ctx = rq->mq_ctx; + }else if (this_hctx != rq->mq_hctx || this_ctx != rq->mq_ctx) { +rq_list_add (&requeue_list, rq); +continue ; + } +list_add_tail (&rq->queuelist, &list); + depth++; + }while (!rq_list_empty (plug->mq_list)); + + plug->mq_list = requeue_list; +trace_block_unplug (this_hctx->queue, depth, !from_sched); +blk_mq_sched_insert_requests (this_hctx, this_ctx, &list, from_sched); +} +void blk_mq_flush_plug_list (struct blk_plug *plug,bool from_schedule) { -struct blk_mq_hw_ctx *this_hctx; -struct blk_mq_ctx *this_ctx;struct request *rq; -unsigned int depth; -LIST_HEAD (list);if (rq_list_empty (plug->mq_list))return ;
@@ -2603,35 +2626,9 @@ void blk_mq_flush_plug_list(struct blk_preturn ; } - this_hctx =NULL ; - this_ctx =NULL ; - depth =0 ;do { - rq =rq_list_pop (&plug->mq_list); - -if (!this_hctx) { - this_hctx = rq->mq_hctx; - this_ctx = rq->mq_ctx; - }else if (this_hctx != rq->mq_hctx || this_ctx != rq->mq_ctx) { -trace_block_unplug (this_hctx->queue, depth, - !from_schedule); -blk_mq_sched_insert_requests (this_hctx, this_ctx, - &list, from_schedule); - depth =0 ; - this_hctx = rq->mq_hctx; - this_ctx = rq->mq_ctx; - - } - -list_add (&rq->queuelist, &list); - depth++; +blk_mq_dispatch_plug_list (plug, from_schedule); }while (!rq_list_empty (plug->mq_list)); - -if (!list_empty (&list)) { -trace_block_unplug (this_hctx->queue, depth, !from_schedule); -blk_mq_sched_insert_requests (this_hctx, this_ctx, &list, - from_schedule); - } } void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,
Greg Kroah-Hartman
maintainerPATCH 2/1126 USB: serial: pl2303: add IBM device IDs
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
commit e1d15646565b284e9ef2433234d6cfdaf66695f1 upstream.
IBM manufactures a PL2303 device for UPS communications. Add the vendor and product IDs so that the PL2303 driver binds to the device.
--- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 3 +++ 2 files changed, 4 insertions(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -116,6 +116,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) }, { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) }, { USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) }, + { USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) }, { } /* Terminating entry */ };
drivers/usb/serial/pl2303.h +3 -0
@@ -35,6 +35,9 @@#define ATEN_PRODUCT_UC232B 0x2022#define ATEN_PRODUCT_ID2 0x2118 +#define IBM_VENDOR_ID 0x04b3 +#define IBM_PRODUCT_ID 0x4016 +#define IODATA_VENDOR_ID 0x04bb#define IODATA_PRODUCT_ID 0x0a03#define IODATA_PRODUCT_ID_RSAQ5 0x0a0e
Greg Kroah-Hartman
maintainerPATCH 3/1126 dt-bindings: usb: hcd: correct usb-device path
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 801109b1a37ad99784e6370cc7e462596f505ea3 upstream.
The usb-device.yaml reference is absolute so it should use /schemas part in path.
--- Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/usb-hcd.yaml +1 -1
@@ -33,7 +33,7 @@ patternProperties: "^.*@[0-9a-f]{1,2}$": description: The hard wired USB devices type: object - $ref: /usb/usb-device.yaml + $ref: /schemas/usb/usb-device.yaml additionalProperties: true
Greg Kroah-Hartman
maintainerPATCH 5/1126 USB: serial: simple: add Nokia phone driver
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c4b9c570965f75d0d55e639747f1e5ccdad2fae0 upstream.
Add a new "simple" driver for certain Nokia phones, including Nokia 130 (RM-1035) which exposes two serial ports in "charging only" mode:
Bus 001 Device 009: ID 0421:069a Nokia Mobile Phones 130 [RM-1035] (Charging only) Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 0 bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 8 idVendor 0x0421 Nokia Mobile Phones idProduct 0x069a 130 [RM-1035] (Charging only) bcdDevice 1.00 iManufacturer 1 Nokia iProduct 2 Nokia 130 (RM-1035) iSerial 0 bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0037
bNumInterfaces 2
bConfigurationValue 1
iConfiguration 0
bmAttributes 0x80
(Bus Powered)
MaxPower 500mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Device Status: 0x0000
(Bus Powered)
--- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/usb/serial/Kconfig +1 -0
@@ -66,6 +66,7 @@ config USB_SERIAL_SIMPLE - Libtransistor USB console - a number of Motorola phones - Motorola Tetra devices + - Nokia mobile phones - Novatel Wireless GPS receivers - Siemens USB/MPI adapter. - ViVOtech ViVOpay USB device.
drivers/usb/serial/usb-serial-simple.c +7 -0
@@ -91,6 +91,11 @@ DEVICE(moto_modem, MOTO_IDS); { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */DEVICE (motorola_tetra,MOTOROLA_TETRA_IDS ); +/* Nokia mobile phone driver */ +#define NOKIA_IDS () \ + { USB_DEVICE(0x0421, 0x069a) }/* Nokia 130 (RM-1035) */ +DEVICE (nokia,NOKIA_IDS ); +/* Novatel Wireless GPS driver */ #define NOVATEL_IDS () \ { USB_DEVICE(0x09d7, 0x0100) }/* NovAtel FlexPack GPS */
@@ -123,6 +128,7 @@ static struct usb_serial_driver * const &vivopay_device, &moto_modem_device, &motorola_tetra_device, + &nokia_device, &novatel_gps_device, &hp4x_device, &suunto_device,
@@ -140,6 +146,7 @@ static const struct usb_device_id id_tabVIVOPAY_IDS (),MOTO_IDS (),MOTOROLA_TETRA_IDS (), +NOKIA_IDS (),NOVATEL_IDS (),HP4X_IDS (), SUUNTO_IDS(),
Greg Kroah-Hartman
maintainerPATCH 7/1126 locking/lockdep: Avoid potential access of invalid memory in lock_class
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
commit 61cc4534b6550997c97a03759ab46b29d44c0017 upstream.
It was found that reading /proc/lockdep after a lockdep splat may potentially cause an access to freed memory if lockdep_unregister_key() is called after the splat but before access to /proc/lockdep [1]. This is due to the fact that graph_lock() call in lockdep_unregister_key() fails after the clearing of debug_locks by the splat process.
After lockdep_unregister_key() is called, the lock_name may be freed but the corresponding lock_class structure still have a reference to it. That invalid memory pointer will then be accessed when /proc/lockdep is read by a user and a use-after-free (UAF) error will be reported if KASAN is enabled.
To fix this problem, lockdep_unregister_key() is now modified to always search for a matching key irrespective of the debug_locks state and zap the corresponding lock class if a matching one is found.
[1] https://lore.kernel.org/lkml/[email protected]/
--- kernel/locking/lockdep.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
kernel/locking/lockdep.c +15 -9
@@ -6290,7 +6290,13 @@ void lockdep_reset_lock(struct lockdep_mlockdep_reset_lock_reg (lock); } -/* Unregister a dynamically allocated key. */ +/* +* Unregister a dynamically allocated key. +* +* Unlike lockdep_register_key(), a search is always done to find a matching +* key irrespective of debug_locks to avoid potential invalid access to freed +* memory in lock_class entry. +*/ void lockdep_unregister_key (struct lock_class_key *key) {struct hlist_head *hash_head =keyhashentry (key);
@@ -6305,10 +6311,8 @@ void lockdep_unregister_key(struct lock_return ;raw_local_irq_save (flags); -if (!graph_lock ()) - goto out_irq; +lockdep_lock (); - pf =get_pending_free ();hlist_for_each_entry_rcu (k, hash_head, hash_entry) {if (k == key) {hlist_del_rcu (&k->hash_entry);
@@ -6316,11 +6320,13 @@ void lockdep_unregister_key(struct lock_break ; } } -WARN_ON_ONCE (!found); -__lockdep_free_key_range (pf, key,1 ); -call_rcu_zapped (pf); -graph_unlock (); -out_irq: +WARN_ON_ONCE (!found && debug_locks); +if (found) { + pf =get_pending_free (); +__lockdep_free_key_range (pf, key,1 ); +call_rcu_zapped (pf); + } +lockdep_unlock ();raw_local_irq_restore (flags);/* Wait until is_dynamic_key() has finished accessing k->hash_entry. */
Greg Kroah-Hartman
maintainerPATCH 13/1126 usb: typec: tipd: Forward plug orientation to typec subsystem
In reply to Greg Kroah-HartmanFrom: Sven Peter <[email protected]>
commit 676748389f5db74e7d28f9d630eebd75cb8a11b4 upstream.
In order to bring up the USB3 PHY on the Apple M1 we need to know the orientation of the Type-C cable. Extract it from the status register and forward it to the typec subsystem.
--- drivers/usb/typec/tipd/core.c | 5 +++++ drivers/usb/typec/tipd/tps6598x.h | 1 + 2 files changed, 6 insertions(+)
drivers/usb/typec/tipd/core.c +5 -0
@@ -256,6 +256,10 @@ static int tps6598x_connect(struct tps65typec_set_pwr_opmode (tps->port, mode);typec_set_pwr_role (tps->port,TPS_STATUS_TO_TYPEC_PORTROLE (status));typec_set_vconn_role (tps->port,TPS_STATUS_TO_TYPEC_VCONN (status)); +if (TPS_STATUS_TO_UPSIDE_DOWN (status)) +typec_set_orientation (tps->port,TYPEC_ORIENTATION_REVERSE ); +else +typec_set_orientation (tps->port,TYPEC_ORIENTATION_NORMAL );tps6598x_set_data_role (tps,TPS_STATUS_TO_TYPEC_DATAROLE (status), true); tps->partner =typec_register_partner (tps->port, &desc);
@@ -278,6 +282,7 @@ static void tps6598x_disconnect(struct ttypec_set_pwr_opmode (tps->port,TYPEC_PWR_MODE_USB );typec_set_pwr_role (tps->port,TPS_STATUS_TO_TYPEC_PORTROLE (status));typec_set_vconn_role (tps->port,TPS_STATUS_TO_TYPEC_VCONN (status)); +typec_set_orientation (tps->port,TYPEC_ORIENTATION_NONE );tps6598x_set_data_role (tps,TPS_STATUS_TO_TYPEC_DATAROLE (status), false);power_supply_changed (tps->psy);
drivers/usb/typec/tipd/tps6598x.h +1 -0
@@ -17,6 +17,7 @@/* TPS_REG_STATUS bits */ #define TPS_STATUS_PLUG_PRESENT BIT(0)#define TPS_STATUS_PLUG_UPSIDE_DOWN BIT(4) +#define TPS_STATUS_TO_UPSIDE_DOWN (s) (!!((s) & TPS_STATUS_PLUG_UPSIDE_DOWN))#define TPS_STATUS_PORTROLE BIT(5)#define TPS_STATUS_TO_TYPEC_PORTROLE (s) (!!((s) & TPS_STATUS_PORTROLE))#define TPS_STATUS_DATAROLE BIT(6)
Greg Kroah-Hartman
maintainercover 5.17.2-rc1 review
This is the start of the stable review cycle for the 5.17.2 release. There are 1126 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, 07 Apr 2022 07:01:33 +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.17.2-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.17.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.17.2-rc1
Eric W. Biederman <[email protected]>
coredump: Use the vma snapshot in fill_files_note
Eric W. Biederman <[email protected]>
coredump/elf: Pass coredump_params into fill_note_info
Eric W. Biederman <[email protected]>
coredump: Remove the WARN_ON in dump_vma_snapshot
Eric W. Biederman <[email protected]>
coredump: Snapshot the vmas in do_coredump
Ulf Hansson <[email protected]>
mmc: rtsx: Fix build errors/warnings for unused variable
Kai-Heng Feng <[email protected]>
mmc: rtsx: Let MMC core handle runtime PM
Jens Axboe <[email protected]>
Revert "nbd: fix possible overflow on 'first_minor' in nbd_dev_add()"
Jackie Liu <[email protected]>
n64cart: convert bi_disk to bi_bdev->bd_disk fix build
Paul E. McKenney <[email protected]>
torture: Make torture.sh help message match reality
Martin Varghese <[email protected]>
openvswitch: Fixed nd target mask field in the flow dump.
Eli Cohen <[email protected]>
vdpa/mlx5: Avoid processing works if workqueue was destroyed
Maciej Fijalkowski <[email protected]>
ice: xsk: Fix indexing in ice_tx_xsk_pool()
Magnus Karlsson <[email protected]>
xsk: Do not write NULL in SW ring at allocation failure
Guilherme G. Piccoli <[email protected]>
docs: sysctl/kernel: add missing bit to panic_print
Anton Ivanov <[email protected]>
um: Fix uml_mconsole stop/go
Kuldeep Singh <[email protected]>
arm64: dts: ls1046a: Update i2c node dma properties
Kuldeep Singh <[email protected]>
arm64: dts: ls1043a: Update i2c dma properties
Kuldeep Singh <[email protected]>
ARM: dts: spear13xx: Update SPI dma properties
Kuldeep Singh <[email protected]>
ARM: dts: spear1340: Update serial node properties
Leilk Liu <[email protected]>
spi: mediatek: support tick_delay without enhance_timing
Guodong Liu <[email protected]>
pinctrl: canonical rsel resistance selection property
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix crop rectangle affected by set format
Janusz Krzysztofik <[email protected]>
media: ov6650: Add try support to selection API operations
Ian Rogers <[email protected]>
perf vendor events: Update metrics for SkyLake Server
Amadeusz Sławiński <[email protected]>
ASoC: topology: Allow TLV control to be either read or write
Zheng Bin <[email protected]>
ASoC: SOF: Intel: Fix build error without SND_SOC_SOF_PCI_DEV
Eric Dumazet <[email protected]>
net: preserve skb_end_offset() in skb_unclone_keeptruesize()
Zhihao Cheng <[email protected]>
ubi: fastmap: Return error code if memory allocation fails in add_aeb()
Horatiu Vultur <[email protected]>
dt-bindings: pinctrl: pinctrl-microchip-sgpio: Fix example
Chen-Yu Tsai <[email protected]>
dt-bindings: pinctrl: mt8195: fix bias-pull-{up,down} checks
Yong Wu <[email protected]>
dt-bindings: memory: mtk-smi: Correct minItems to 2 for the gals clocks
Yong Wu <[email protected]>
dt-bindings: memory: mtk-smi: No need mediatek,larb-id for mt8167
Yong Wu <[email protected]>
dt-bindings: memory: mtk-smi: Rename clock to clocks
Martin Kepplinger <[email protected]>
media: dt-bindings: media: hynix,hi846: add link-frequencies description
Martin Kepplinger <[email protected]>
media: dt-binding: media: hynix,hi846: use $defs/port-base port description
Miquel Raynal <[email protected]>
dt-bindings: spi: mxic: The interrupt property is not mandatory
Miquel Raynal <[email protected]>
dt-bindings: mtd: nand-controller: Fix a comment in the examples
Miquel Raynal <[email protected]>
dt-bindings: mtd: nand-controller: Fix the reg property description
Kai-Heng Feng <[email protected]>
mmc: rtsx: Use pm_runtime_{get,put}() to handle runtime PM
Zhang Wensheng <[email protected]>
nbd: fix possible overflow on 'first_minor' in nbd_dev_add()
Hengqi Chen <[email protected]>
bpf: Fix comment for helper bpf_current_task_under_cgroup()
Namhyung Kim <[email protected]>
bpf: Adjust BPF stack helper functions to accommodate skip > 0
Toke Høiland-Jørgensen <[email protected]>
libbpf: Define BTF_KIND_* constants in btf.h to avoid compilation errors
Kuniyuki Iwashima <[email protected]>
af_unix: Support POLLPRI for OOB.
Randy Dunlap <[email protected]>
mm/usercopy: return 1 from hardened_usercopy __setup() handler
Randy Dunlap <[email protected]>
mm/memcontrol: return 1 from cgroup.memory __setup() handler
Randy Dunlap <[email protected]>
ARM: 9187/1: JIVE: fix return value of __setup handler
Randy Dunlap <[email protected]>
mm/mmap: return 1 from stack_guard_gap __setup() handler
Eric Dumazet <[email protected]>
net: add skb_set_end_offset() helper
Nemanja Rakovic <[email protected]>
mips: Enable KCSAN - take 2
Steven Rostedt (Google) <[email protected]>
tracing: Have type enum modifications copy the strings
Linus Torvalds <[email protected]>
Reinstate some of "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""
Duoming Zhou <[email protected]>
ax25: fix UAF bug in ax25_send_control()
Maxim Levitsky <[email protected]>
KVM: x86: SVM: fix avic spec based definitions again
Jiasheng Jiang <[email protected]>
ASoC: soc-compress: Change the check for codec_dai
Will Deacon <[email protected]>
arm64: mm: Drop 'const' from conditional arm64_dma_phys_limit definition
Wan Jiabing <[email protected]>
docs: fix 'make htmldocs' warning in SCTP.rst
Arınç ÜNAL <[email protected]>
staging: mt7621-dts: fix pinctrl-0 items to be size-1 items on ethernet
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Add qla2x00_async_done() for async routines
Maxime Ripard <[email protected]>
drm/connector: Fix typo in documentation
Joerg Roedel <[email protected]>
x86/sev: Unroll string mmio with CC_ATTR_GUEST_UNROLL_STRING_IO
Yang Zhong <[email protected]>
x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation
Lv Ruyi <[email protected]>
proc: bootconfig: Add null pointer check
Oliver Hartkopp <[email protected]>
can: isotp: restore accidentally removed MSG_PEEK feature
Hans de Goede <[email protected]>
platform/x86: asus-wmi: Fix regression when probing for fan curve control
Prashant Malani <[email protected]>
platform/chrome: cros_ec_typec: Check for EC device
Jon Hunter <[email protected]>
spi: Fix Tegra QSPI example
Anirudh Rayabharam <[email protected]>
vhost: handle error while adding split ranges to iotlb
Rafael J. Wysocki <[email protected]>
ACPI: CPPC: Avoid out of bounds access when parsing _CPC data
Fangrui Song <[email protected]>
riscv module: remove (NOLOAD)
Pavel Begunkov <[email protected]>
io_uring: fix memory leak of uid in files registration
Jens Axboe <[email protected]>
io_uring: bump poll refs to full 31-bits
Jens Axboe <[email protected]>
io_uring: remove poll entry from list when canceling all
Stefano Garzarella <[email protected]>
virtio: use virtio_device_ready() in virtio_device_restore()
Jason Wang <[email protected]>
Revert "virtio_pci: harden MSI-X interrupts"
Jason Wang <[email protected]>
Revert "virtio-pci: harden INTX interrupts"
Jiri Slaby <[email protected]>
block: restore the old set_task_ioprio() behaviour wrt PF_EXITING
Christophe JAILLET <[email protected]>
block: Fix the maximum minor value is blk_alloc_ext_minor()
Arnd Bergmann <[email protected]>
ARM: iop32x: offset IRQ numbers by 1
Baokun Li <[email protected]>
ubi: Fix race condition between ctrl_cdev_ioctl and ubi_cdev_ioctl
Jiaxin Yu <[email protected]>
ASoC: mediatek: mt6358: add missing EXPORT_SYMBOLs
Meng Tang <[email protected]>
ASoC: rockchip: i2s_tdm: Fixup config for SND_SOC_DAIFMT_DSP_A/B
Jonathan Neuschäfer <[email protected]>
pinctrl: nuvoton: npcm7xx: Use %zu printk format for ARRAY_SIZE()
Jonathan Neuschäfer <[email protected]>
pinctrl: nuvoton: npcm7xx: Rename DS() macro to DSTR()
Randy Dunlap <[email protected]>
net: sparx5: uses, depends on BRIDGE or !BRIDGE
Miaoqian Lin <[email protected]>
watchdog: rti-wdt: Add missing pm_runtime_disable() in probe function
Chen-Yu Tsai <[email protected]>
pinctrl: pinconf-generic: Print arguments for bias-pull-*
Eric Dumazet <[email protected]>
watch_queue: Free the page array when watch_queue is dismantled
Herbert Xu <[email protected]>
crypto: arm/aes-neonbs-cbc - Select generic cbc and aes
Peter Zijlstra <[email protected]>
crypto: x86/poly1305 - Fixup SLS
Robin Gong <[email protected]>
mailbox: imx: fix wakeup failure from freeze mode
David Howells <[email protected]>
rxrpc: Fix call timer start racing with call destruction
Xiaolong Huang <[email protected]>
rxrpc: fix some null-ptr-deref bugs in server_key.c
Guangbin Huang <[email protected]>
net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware
Yufeng Mo <[email protected]>
net: hns3: fix the concurrency between functions reading debugfs
Andrew Price <[email protected]>
gfs2: Make sure FITRIM minlen is rounded up to fs block size
Andreas Gruenbacher <[email protected]>
gfs2: Fix gfs2_file_buffered_write endless loop workaround
Andreas Gruenbacher <[email protected]>
gfs2: gfs2_setattr_size error path fix
Carlos Llamas <[email protected]>
loop: fix ioctl calls using compat_loop_info
Tom Rix <[email protected]>
rtc: check if __rtc_read_time was successful
Miaoqian Lin <[email protected]>
rtc: gamecube: Fix refcount leak in gamecube_rtc_read_offset_from_sram
Masahiro Yamada <[email protected]>
modpost: restore the warning message for missing symbol versions
Matthew Wilcox (Oracle) <[email protected]>
XArray: Update the LRU list in xas_split()
Matthew Wilcox (Oracle) <[email protected]>
XArray: Include bitmap.h from xarray.h
Tom Rix <[email protected]>
can: mcp251xfd: mcp251xfd_register_get_dev_id(): fix return of error value
Pavel Skripkin <[email protected]>
can: mcba_usb: properly check endpoint type
Hangyu Hua <[email protected]>
can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path
Matthew Wilcox (Oracle) <[email protected]>
XArray: Fix xas_create_range() when multi-order entry present
Jason A. Donenfeld <[email protected]>
wireguard: socket: ignore v6 endpoints when ipv6 is disabled
Wang Hai <[email protected]>
wireguard: socket: free skb in send6 when ipv6 is disabled
Jason A. Donenfeld <[email protected]>
wireguard: queueing: use CFI-safe ptr_ring cleanup function
Pankaj Raghav <[email protected]>
nvme: fix the read-only state for zoned namespaces with unsupposed features
Sungup Moon <[email protected]>
nvme: allow duplicate NSIDs for private namespaces
Baokun Li <[email protected]>
ubifs: rename_whiteout: correct old_dir size computing
Zhihao Cheng <[email protected]>
ubifs: Fix to add refcount once page is set private
Zhihao Cheng <[email protected]>
ubifs: Fix read out-of-bounds in ubifs_wbuf_write_nolock()
Zhihao Cheng <[email protected]>
ubifs: setflags: Make dirtied_ino_d 8 bytes aligned
Zhihao Cheng <[email protected]>
ubifs: Rectify space amount budget for mkdir/tmpfile operations
Zhihao Cheng <[email protected]>
ubifs: Fix 'ui->dirty' race between do_tmpfile() and writeback work
Zhihao Cheng <[email protected]>
ubifs: Rename whiteout atomically
Zhihao Cheng <[email protected]>
ubifs: Add missing iput if do_tmpfile() failed in rename whiteout
Zhihao Cheng <[email protected]>
ubifs: Fix deadlock in concurrent rename whiteout and inode writeback
Zhihao Cheng <[email protected]>
ubifs: rename_whiteout: Fix double free for whiteout_ui->data
David Woodhouse <[email protected]>
KVM: avoid double put_page with gfn-to-pfn cache
Yi Wang <[email protected]>
KVM: SVM: fix panic on out-of-bounds guest IRQ
Li RongQing <[email protected]>
KVM: x86: fix sending PV IPI
David Matlack <[email protected]>
KVM: Prevent module exit until all VMs are freed
Paolo Bonzini <[email protected]>
KVM: x86/mmu: do compare-and-exchange of gPTE via the user address
Vitaly Kuznetsov <[email protected]>
KVM: x86: Forbid VMM to set SYNIC/STIMER MSRs when SynIC wasn't activated
Vitaly Kuznetsov <[email protected]>
KVM: x86: Avoid theoretical NULL pointer dereference in kvm_irq_delivery_to_apic_fast()
Vitaly Kuznetsov <[email protected]>
KVM: x86: Check lapic_in_kernel() before attempting to set a SynIC irq
Paul Cercueil <[email protected]>
MIPS: crypto: Fix CRC32 code
Gwendal Grignou <[email protected]>
platform: chrome: Split trace include file
Manish Rangankar <[email protected]>
scsi: qla2xxx: Use correct feature type field during RFF_ID processing
Quinn Tran <[email protected]>
scsi: qla2xxx: Reduce false trigger to login
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix stuck session of PRLI reject
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix N2N inconsistent PLOGI
Arun Easi <[email protected]>
scsi: qla2xxx: Fix crash during module load unload test
Arun Easi <[email protected]>
scsi: qla2xxx: Fix missed DMA unmap for NVMe ls requests
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix laggy FC remote port session recovery
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix hang due to session stuck
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix incorrect reporting of task management failure
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix disk failure to rediscover
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Suppress a kernel complaint in qla_create_qpair()
Joe Carnuccio <[email protected]>
scsi: qla2xxx: Check for firmware dump already collected
Joe Carnuccio <[email protected]>
scsi: qla2xxx: Add devids and conditionals for 28xx
Joe Carnuccio <[email protected]>
scsi: qla2xxx: Fix T10 PI tag escape and IP guard options for 28XX adapters
Quinn Tran <[email protected]>
scsi: qla2xxx: edif: Fix clang warning
Arun Easi <[email protected]>
scsi: qla2xxx: Fix device reconnect in loop topology
Nilesh Javali <[email protected]>
scsi: qla2xxx: Fix warning for missing error code
Bikash Hazarika <[email protected]>
scsi: qla2xxx: Fix wrong FDMI data for 64G adapter
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix premature hw access after PCI error
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix scheduling while atomic
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix warning message due to adisc being flushed
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix stuck session in gpdb
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Implement ref count for SRB
Daniel Wagner <[email protected]>
scsi: qla2xxx: Refactor asynchronous command initialization
Ville Syrjälä <[email protected]>
drm/i915: Reject unsupported TMDS rates on ICL+
Ville Syrjälä <[email protected]>
drm/i915: Fix PSF GV point mask when SAGV is not possible
Ville Syrjälä <[email protected]>
drm/i915: Treat SAGV block time 0 as SAGV disabled
Kees Cook <[email protected]>
drm/dp: Fix off-by-one in register cache size
Anders Roxell <[email protected]>
powerpc: Fix build errors with newer binutils
Christophe Leroy <[email protected]>
powerpc: Add set_memory_{p/np}() and remove set_memory_attr()
Anders Roxell <[email protected]>
powerpc/lib/sstep: Fix build errors with newer binutils
Anders Roxell <[email protected]>
powerpc/lib/sstep: Fix 'sthcx' instruction
Nicholas Piggin <[email protected]>
powerpc/tm: Fix more userspace r13 corruption
Chen Jingwen <[email protected]>
powerpc/kasan: Fix early region not updated correctly
Vitaly Kuznetsov <[email protected]>
KVM: x86: hyper-v: HVCALL_SEND_IPI_EX is an XMM fast hypercall
Vitaly Kuznetsov <[email protected]>
KVM: x86: hyper-v: Fix the maximum number of sparse banks for XMM fast TLB flush hypercalls
Vitaly Kuznetsov <[email protected]>
KVM: x86: hyper-v: Drop redundant 'ex' parameter from kvm_hv_flush_tlb()
Vitaly Kuznetsov <[email protected]>
KVM: x86: hyper-v: Drop redundant 'ex' parameter from kvm_hv_send_ipi()
Sean Christopherson <[email protected]>
KVM: x86/mmu: Check for present SPTE when clearing dirty bit in TDP MMU
Sean Christopherson <[email protected]>
KVM: x86/mmu: Zap _all_ roots when unmapping gfn range in TDP MMU
Sean Christopherson <[email protected]>
KVM: x86/mmu: Move "invalid" check out of kvm_tdp_mmu_get_root()
Sean Christopherson <[email protected]>
KVM: x86/mmu: Use common TDP MMU zap helper for MMU notifier unmap hook
Paolo Bonzini <[email protected]>
KVM: x86: Reinitialize context if host userspace toggles EFER.LME
Suravee Suthikulpanit <[email protected]>
KVM: SVM: Allow AVIC support on system w/ physical APIC ID > 255
Matt Kramer <[email protected]>
ALSA: hda/realtek: Add alc256-samsung-headphone fixup
Mauro Carvalho Chehab <[email protected]>
media: atomisp: fix bad usage at error handling logic
Miaoqian Lin <[email protected]>
ASoC: mediatek: Fix error handling in mt8183_da7219_max98357_dev_probe
Ulf Hansson <[email protected]>
mmc: host: Return an error when ->enable_sdio_irq() ops is missing
Steven Rostedt (Google) <[email protected]>
tracing: Have TRACE_DEFINE_ENUM affect trace event types as well
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: sof_es8336: log all quirks
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: sof_es8336: use NHLT information to set dmic and SSP
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: Revert "ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021"
Pierre-Louis Bossart <[email protected]>
ALSA: intel-dspconfig: add ES8336 support for CNL
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: soc-acpi: add more ACPI HIDs for ES83x6 devices
Pierre-Louis Bossart <[email protected]>
ALSA: intel-dsp-config: add more ACPI HIDs for ES83x6 devices
Pierre-Louis Bossart <[email protected]>
ALSA: intel-nhlt: add helper to detect SSP link mask
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: hda: retrieve DMIC number for I2S boards
Anthony I Gilea <[email protected]>
ASoC: Intel: sof_sdw: fix quirks for 2022 HP Spectre x360 13"
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: debug: clarify operator precedence
Dongliang Mu <[email protected]>
media: hdpvr: initialize dev->worker at hdpvr_register_videodev
Pavel Skripkin <[email protected]>
media: Revert "media: em28xx: add missing em28xx_close_extension"
Hans de Goede <[email protected]>
media: i2c: ov5648: Fix lockdep error
Zheyu Ma <[email protected]>
video: fbdev: sm712fb: Fix crash in smtcfb_write()
Vijendar Mukunda <[email protected]>
ASoC: amd: vangogh: fix uninitialized symbol warning in machine driver
Vijendar Mukunda <[email protected]>
ASoC: amd: vg: fix for pm resume callback sequence
Uwe Kleine-König <[email protected]>
ARM: mmp: Fix failure to remove sram device
Richard Leitner <[email protected]>
ARM: tegra: tamonten: Fix I2C3 pad setting
Arnd Bergmann <[email protected]>
lib/test_lockup: fix kernel pointer check for separate address spaces
Arnd Bergmann <[email protected]>
uaccess: fix type mismatch warnings from access_ok()
Svyatoslav Ryhel <[email protected]>
ARM: tegra: transformer: Drop reg-shift for Tegra HS UART
Derek Fang <[email protected]>
ASoC: rt5682s: Fix the wrong jack type detected
Daniel González Cabanelas <[email protected]>
media: cx88-mpeg: clear interrupt status register before streaming video
Ming Qian <[email protected]>
media: imx-jpeg: fix a bug of accessing array out of bounds
Mauro Carvalho Chehab <[email protected]>
ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021
Shengjiu Wang <[email protected]>
ASoC: soc-core: skip zero num_dai component in searching dai name
Richard Schleich <[email protected]>
ARM: dts: bcm2711: Add the missing L1/L2 cache information
Jing Yao <[email protected]>
video: fbdev: udlfb: replace snprintf in show functions with sysfs_emit
Jing Yao <[email protected]>
video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
Jing Yao <[email protected]>
video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
Marcel Ziswiler <[email protected]>
arm64: defconfig: build imx-sdma as a module
Abel Vesa <[email protected]>
ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk
Takashi Iwai <[email protected]>
ALSA: hda: Fix driver index handling at re-binding
Ard Biesheuvel <[email protected]>
ARM: ftrace: avoid redundant loads or clobbering IP
Tsuchiya Yuto <[email protected]>
media: atomisp: fix dummy_ptr check to avoid duplicate active_bo
Hans de Goede <[email protected]>
media: atomisp_gmin_platform: Add DMI quirk to not turn AXP ELDO2 regulator off on some boards
Charles Keepax <[email protected]>
ASoC: madera: Add dependencies on MFD
Richard Schleich <[email protected]>
ARM: dts: bcm2837: Add the missing L1/L2 cache information
David Heidelberg <[email protected]>
ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960
Yang Guang <[email protected]>
video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
George Kennedy <[email protected]>
video: fbdev: cirrusfb: check pixclock to avoid divide by zero
Evgeny Novikov <[email protected]>
video: fbdev: w100fb: Reset global state
Tim Gardner <[email protected]>
video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
Yong Wu <[email protected]>
media: iommu/mediatek: Add device_link between the consumer and the larb devices
Yong Wu <[email protected]>
media: iommu/mediatek: Return ENODEV if the device is NULL
Yong Wu <[email protected]>
media: iommu/mediatek-v1: Free the existed fwspec if the master dev already has
Ranjani Sridharan <[email protected]>
ASoC: SOF: Intel: hda: Remove link assignment limitation
Mirela Rabulea <[email protected]>
media: imx-jpeg: Prevent decoding NV12M jpegs into single-planar buffers
Bard Liao <[email protected]>
ASoC: SOF: Intel: match sdw version on link_slaves_found
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Report full jack status when plug is detected
Lad Prabhakar <[email protected]>
ASoC: sh: rz-ssi: Make the data structures available before registering the handlers
Peiwei Hu <[email protected]>
media: ir_toy: free before error exiting
Eugen Hristev <[email protected]>
media: atmel: atmel-isc-base: report frame sizes as full supported range
Hans Verkuil <[email protected]>
media: staging: media: zoran: fix various V4L2 compliance errors
Corentin Labbe <[email protected]>
media: staging: media: zoran: calculate the right buffer number for zoran_reap_stat_com
Corentin Labbe <[email protected]>
media: staging: media: zoran: move videodev alloc
Dongliang Mu <[email protected]>
ntfs: add sanity check on allocation size
Rohith Surabattula <[email protected]>
Adjust cifssb maximum read size
Chao Yu <[email protected]>
f2fs: compress: fix to print raw data size in error path of lz4 decompression
Jaegeuk Kim <[email protected]>
f2fs: use spin_lock to avoid hang
Josef Bacik <[email protected]>
btrfs: do not clean up repair bio if submit fails
Josef Bacik <[email protected]>
btrfs: do not double complete bio on errors during compressed reads
Josef Bacik <[email protected]>
btrfs: handle csum lookup errors properly on reads
Josef Bacik <[email protected]>
btrfs: make search_csum_tree return 0 if we get -EFBIG
Anand Jain <[email protected]>
btrfs: harden identification of a stale device
Jaegeuk Kim <[email protected]>
f2fs: don't get FREEZE lock in f2fs_evict_inode in frozen fs
Chuck Lever <[email protected]>
NFSD: Fix nfsd_breaker_owns_lease() return values
Chao Yu <[email protected]>
f2fs: fix to do sanity check on curseg->alloc_type
Theodore Ts'o <[email protected]>
ext4: don't BUG if someone dirty pages without asking ext4 first
Valentin Schneider <[email protected]>
sched/tracing: Report TASK_RTLOCK_WAIT tasks as TASK_UNINTERRUPTIBLE
Valentin Schneider <[email protected]>
sched/tracing: Don't re-read p->state when emitting sched_switch event
Ritesh Harjani <[email protected]>
ext4: fix ext4_mb_mark_bb() with flex_bg with fast_commit
Ritesh Harjani <[email protected]>
ext4: correct cluster len and clusters changed accounting in ext4_mb_mark_bb
Waiman Long <[email protected]>
locking/lockdep: Iterate lock_classes directly when reading lockdep files
Mark Rutland <[email protected]>
atomics: Fix atomic64_{read_acquire,set_release} fallbacks
Eddie James <[email protected]>
spi: fsi: Implement a timeout for polling status
Minghao Chi <[email protected]>
spi: tegra20: Use of_device_get_match_data()
Chris Leech <[email protected]>
nvme-tcp: lockdep: annotate in-kernel sockets
John David Anglin <[email protected]>
parisc: Fix handling off probe non-access faults
John David Anglin <[email protected]>
parisc: Fix non-access data TLB cache flush faults
Dmitry Baryshkov <[email protected]>
PM: core: keep irq flags in device_pm_check_callbacks()
Darren Hart <[email protected]>
ACPI/APEI: Limit printable size of BERT table data
Paolo Valente <[email protected]>
Revert "Revert "block, bfq: honor already-setup queue merges""
Paul Menzel <[email protected]>
lib/raid6/test/Makefile: Use $(pound) instead of \# for Make 4.3
Hans de Goede <[email protected]>
ACPI / x86: Add skip i2c clients quirk for Lenovo Yoga Tablet 1050F/L
Hans de Goede <[email protected]>
ACPI / x86: Add skip i2c clients quirk for Nextbook Ares 8
Rafael J. Wysocki <[email protected]>
ACPICA: Avoid walking the ACPI Namespace if it is not there
Zhang Wensheng <[email protected]>
bfq: fix use-after-free in bfq_dispatch_request
Wan Jiabing <[email protected]>
hwrng: cavium - fix NULL but dereferenced coccicheck error
Akira Kawata <[email protected]>
fs/binfmt_elf: Fix AT_PHDR for unusual ELF files
Souptick Joarder (HPE) <[email protected]>
irqchip/nvic: Release nvic_base upon failure
Marc Zyngier <[email protected]>
irqchip/qcom-pdc: Fix broken locking
Casey Schaufler <[email protected]>
Fix incorrect type in assignment of ipv6 port for audit
Chaitanya Kulkarni <[email protected]>
loop: use sysfs_emit() in the sysfs xxx show()
Richard Haines <[email protected]>
selinux: allow FIOCLEX and FIONCLEX with policy capability
Fangrui Song <[email protected]>
arm64: module: remove (NOLOAD) from linker script
Daniel Lezcano <[email protected]>
powercap/dtpm_cpu: Reset per_cpu variable in the release function
Christian Göttsche <[email protected]>
selinux: use correct type for context length
Yu Kuai <[email protected]>
block, bfq: don't move oom_bfqq
Kai Ye <[email protected]>
crypto: hisilicon/sec - not need to enable sm4 extra mode at HW V3
Herbert Xu <[email protected]>
crypto: xts - Add softdep on ecb
Yahu Gao <[email protected]>
block/bfq_wf2q: correct weight to ioprio
Christoph Hellwig <[email protected]>
memstick/mspro_block: fix handling of read-only devices
Ming Lei <[email protected]>
block: throttle split bio in case of iops limit
Paul E. McKenney <[email protected]>
rcu: Mark writes to the rcu_segcblist structure's ->flags field
Marc Zyngier <[email protected]>
pinctrl: npcm: Fix broken references to chip->parent_device
David Woodhouse <[email protected]>
rcu: Kill rnp->ofl_seq and use only rcu_state.ofl_lock for exclusion
Kees Cook <[email protected]>
gcc-plugins/stackleak: Exactly match strings instead of prefixes
Srujana Challa <[email protected]>
crypto: octeontx2 - CN10K CPT to RNM workaround
Kai Ye <[email protected]>
crypto: hisilicon/qm - cleanup warning in qm_vf_read_qos
Dave Stevenson <[email protected]>
regulator: rpi-panel: Handle I2C errors/timing to the Atmel
Casey Schaufler <[email protected]>
LSM: general protection fault in legacy_parse_param
Linus Torvalds <[email protected]>
fs: fix fd table size alignment properly
Dan Carpenter <[email protected]>
lib/test: use after free in register_test_dev_kmod()
Linus Torvalds <[email protected]>
fs: fd tables have to be multiples of BITS_PER_LONG
Xiaomeng Tong <[email protected]>
net: dsa: bcm_sf2_cfp: fix an incorrect NULL check on list iterator
Trond Myklebust <[email protected]>
NFSv4/pNFS: Fix another issue with a list iterator pointing to the head
Marcelo Ricardo Leitner <[email protected]>
net/sched: act_ct: fix ref leak when switching zones
Jakub Kicinski <[email protected]>
selftests: tls: skip cmsg_to_pipe tests with TLS=n
Tom Rix <[email protected]>
octeontx2-af: initialize action variable
Zheng Yongjun <[email protected]>
net: sparx5: switchdev: fix possible NULL pointer dereference
Duoming Zhou <[email protected]>
net/x25: Fix null-ptr-deref caused by x25_disconnect
Tom Rix <[email protected]>
qlcnic: dcb: default to returning -EOPNOTSUPP
Randy Dunlap <[email protected]>
net: sparx5: depends on PTP_1588_CLOCK_OPTIONAL
Guangbin Huang <[email protected]>
net: hns3: fix phy can not link up when autoneg off and reset
Hao Chen <[email protected]>
net: hns3: add NULL pointer check for hns3_set/get_ringparam()
Hao Chen <[email protected]>
net: hns3: add netdev reset check for hns3_set_tunable()
Peng Li <[email protected]>
net: hns3: clean residual vf config after disable sriov
Hao Chen <[email protected]>
net: hns3: add max order judgement for tx spare buffer
Hao Chen <[email protected]>
net: hns3: fix ethtool tx copybreak buf size indicating not aligned issue
Shunsuke Nakamura <[email protected]>
libperf tests: Fix typo in perf_evlist__open() failure error messages
Trond Myklebust <[email protected]>
NFS: Don't loop forever in nfs_do_recoalesce()
Ido Schimmel <[email protected]>
selftests: test_vxlan_under_vrf: Fix broken test case
Florian Fainelli <[email protected]>
net: phy: broadcom: Fix brcm_fet_config_init()
Jian Shen <[email protected]>
net: hns3: refine the process when PF set VF VLAN
Jian Shen <[email protected]>
net: hns3: add vlan list lock to protect vlan list
Jian Shen <[email protected]>
net: hns3: fix port base vlan add fail when concurrent with reset
Jian Shen <[email protected]>
net: hns3: fix bug when PF set the duplicate MAC address for VFs
Vladimir Oltean <[email protected]>
net: enetc: report software timestamping via SO_TIMESTAMPING
Juergen Gross <[email protected]>
xen: fix is_xen_pmu()
Maxime Ripard <[email protected]>
clk: Initialize orphan req_rate
Stefano Garzarella <[email protected]>
vsock/virtio: enable VQs early on probe
Stefano Garzarella <[email protected]>
vsock/virtio: read the negotiated features before using VQs
Stefano Garzarella <[email protected]>
vsock/virtio: initialize vdev->priv before using VQs
Konrad Dybcio <[email protected]>
clk: qcom: gcc-msm8994: Fix gpll4 width
Bjorn Andersson <[email protected]>
net: stmmac: dwmac-qcom-ethqos: Enable RGMII functional clock on resume
Thomas Richter <[email protected]>
perf stat: Fix forked applications enablement of counters
Daniel Thompson <[email protected]>
kdb: Fix the putarea helper function
Olga Kornievskaia <[email protected]>
NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error
Olga Kornievskaia <[email protected]>
SUNRPC don't resend a task on an offlined transport
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options
Phil Sutter <[email protected]>
netfilter: egress: Report interface as outgoing
Ian Rogers <[email protected]>
perf parse-events: Move slots only with topdown
Trond Myklebust <[email protected]>
SUNRPC: Don't call connect() more than once on a TCP socket
NeilBrown <[email protected]>
SUNRPC: improve 'swap' handling: scheduling and PF_MEMALLOC
NeilBrown <[email protected]>
SUNRPC/call_alloc: async tasks mustn't block waiting for memory
Pavel Skripkin <[email protected]>
jfs: fix divide error in dbNextAG
German Gomez <[email protected]>
perf test arm64: Test unwinding using fame-pointer (fp) mode
Randy Dunlap <[email protected]>
driver core: dd: fix return value of __setup handler
David Gow <[email protected]>
firmware: google: Properly state IOMEM dependency
Randy Dunlap <[email protected]>
kgdbts: fix return value of __setup handler
Xiaolong Huang <[email protected]>
virt: acrn: fix a memory leak in acrn_dev_ioctl()
Yonghua Huang <[email protected]>
virt: acrn: obtain pa from VMA with PFNMAP flag
Ilpo Järvinen <[email protected]>
serial: 8250: fix XOFF/XON sending when DMA is used
Randy Dunlap <[email protected]>
kgdboc: fix return value of __setup handler
Randy Dunlap <[email protected]>
tty: hvc: fix return value of __setup handler
Dan Carpenter <[email protected]>
clk: visconti: prevent array overflow in visconti_clk_register_gates()
Miaoqian Lin <[email protected]>
pinctrl/rockchip: Add missing of_node_put() in rockchip_pinctrl_probe
Miaoqian Lin <[email protected]>
pinctrl: nomadik: Add missing of_node_put() in nmk_pinctrl_probe
Michael Walle <[email protected]>
pinctrl: microchip-sgpio: lock RMW access
Horatiu Vultur <[email protected]>
pinctrl: ocelot: Fix interrupt parsing
Chen-Yu Tsai <[email protected]>
pinctrl: mediatek: paris: Skip custom extra pin config dump for virtual GPIOs
Chen-Yu Tsai <[email protected]>
pinctrl: mediatek: paris: Fix pingroup pin config state readback
Chen-Yu Tsai <[email protected]>
pinctrl: mediatek: paris: Fix "argument" argument type for mtk_pinconf_get()
Chen-Yu Tsai <[email protected]>
pinctrl: mediatek: paris: Fix PIN_CONFIG_BIAS_* readback
Miaoqian Lin <[email protected]>
pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init
Michael Walle <[email protected]>
pinctrl: ocelot: fix duplicate debugfs entry
Michael Walle <[email protected]>
pinctrl: ocelot: fix confops resource index
Arınç ÜNAL <[email protected]>
staging: mt7621-dts: fix GB-PC2 devicetree
Arınç ÜNAL <[email protected]>
staging: mt7621-dts: fix pinctrl properties for ethernet
Arınç ÜNAL <[email protected]>
staging: mt7621-dts: fix formatting
Arınç ÜNAL <[email protected]>
staging: mt7621-dts: fix LEDs and pinctrl on GB-PC1 devicetree
Alexey Khoroshilov <[email protected]>
NFS: remove unneeded check in decode_devicenotify_args()
Robin Gong <[email protected]>
mailbox: imx: fix crash in resume on i.mx8ulp
Miaoqian Lin <[email protected]>
clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver
Maxime Ripard <[email protected]>
clk: Fix clk_hw_get_clk() when dev is NULL
Jonathan Neuschäfer <[email protected]>
clk: clps711x: Terminate clk_div_table with sentinel element
Jonathan Neuschäfer <[email protected]>
clk: hisilicon: Terminate clk_div_table with sentinel element
Jonathan Neuschäfer <[email protected]>
clk: loongson1: Terminate clk_div_table with sentinel element
Jonathan Neuschäfer <[email protected]>
clk: actions: Terminate clk_div_table with sentinel element
Dan Williams <[email protected]>
nvdimm/region: Fix default alignment for small regions
Miaoqian Lin <[email protected]>
remoteproc: qcom_q6v5_mss: Fix some leaks in q6v5_alloc_memory_region
Miaoqian Lin <[email protected]>
remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region
Miaoqian Lin <[email protected]>
remoteproc: qcom: Fix missing of_node_put in adsp_alloc_memory_region
Jie Hai <[email protected]>
dmaengine: hisi_dma: fix MSI allocate fail when reload hisi_dma
Emil Renner Berthing <[email protected]>
clk: starfive: jh7100: Handle audio_div clock properly
Emil Renner Berthing <[email protected]>
clk: starfive: jh7100: Don't round divisor up twice
Taniya Das <[email protected]>
clk: qcom: clk-rcg2: Update the frac table for pixel clock
Taniya Das <[email protected]>
clk: qcom: clk-rcg2: Update logic to calculate D value for RCG
Codrin Ciubotariu <[email protected]>
clk: at91: sama7g5: fix parents of PDMCs' GCLK
Dan Carpenter <[email protected]>
clk: imx: off by one in imx_lpcg_parse_clks_from_dt()
Abel Vesa <[email protected]>
clk: imx7d: Remove audio_mclk_root_clk
Randy Dunlap <[email protected]>
dma-debug: fix return value of __setup handlers
Martin Kaiser <[email protected]>
staging: r8188eu: fix endless loop in recv_func
Trond Myklebust <[email protected]>
NFS: Return valid errors from nfs2/3_decode_dirent()
Jiasheng Jiang <[email protected]>
habanalabs: Add check for pci_enable_device
Jiasheng Jiang <[email protected]>
iio: adc: Add check for devm_request_threaded_irq
Uwe Kleine-König <[email protected]>
serial: 8250: Fix race condition in RTS-after-send handling
Trond Myklebust <[email protected]>
NFS: Use of mapping_set_error() results in spurious errors
Andy Shevchenko <[email protected]>
serial: 8250_lpss: Balance reference count for PCI DMA device
Andy Shevchenko <[email protected]>
serial: 8250_mid: Balance reference count for PCI DMA device
Rafał Miłecki <[email protected]>
phy: phy-brcm-usb: fixup BCM4908 support
Liu Ying <[email protected]>
phy: dphy: Correct lpx parameter and its derivatives(ta_{get,go,sure})
Dirk Buchwalder <[email protected]>
clk: qcom: ipq8074: Use floor ops for SDCC1 clock
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: checker: Fix miscalculation of number of states
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a77470: Reduce size for narrow VIN1 channel
Geert Uytterhoeven <[email protected]>
clk: renesas: r8a779f0: Fix RSW2 clock divider
Jonathan Cameron <[email protected]>
staging:iio:adc:ad7280a: Fix handing of device address bit reversing.
Zev Weiss <[email protected]>
serial: 8250_aspeed_vuart: add PORT_ASPEED_VUART port type
Hangyu Hua <[email protected]>
staging: qlge: add unregister_netdev in qlge_probe
Hans de Goede <[email protected]>
iio: mma8452: Fix probe failing when an i2c_device_id is used
Dave Jiang <[email protected]>
dmaengine: idxd: restore traffic class defaults after wq reset
Robert Marko <[email protected]>
clk: qcom: ipq8074: fix PCI-E clock oops
Libin Yang <[email protected]>
soundwire: intel: fix wrong register name in intel_shim_wake
Luca Weiss <[email protected]>
cpufreq: qcom-cpufreq-nvmem: fix reading of PVS Valid fuse
Christophe JAILLET <[email protected]>
misc: alcor_pci: Fix an error handling path
Christophe JAILLET <[email protected]>
fsi: Aspeed: Fix a potential double free
Robert Hancock <[email protected]>
pps: clients: gpio: Propagate return value from pps_gpio_probe
Uwe Kleine-König <[email protected]>
pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add()
Joel Stanley <[email protected]>
fsi: scom: Remove retries in indirect scoms
Joel Stanley <[email protected]>
fsi: scom: Fix error handling
Jiri Slaby <[email protected]>
mxser: fix xmit_buf leak in activate when LSR == 0xff
Michael Straube <[email protected]>
staging: r8188eu: release_firmware is not called if allocation fails
Lad Prabhakar <[email protected]>
clk: renesas: r9a07g044: Update multiplier and divider values for PLL2/3
Miaohe Lin <[email protected]>
kernel/resource: fix kfree() of bootmem memory again
Sondhauß, Jan <[email protected]>
drivers: ethernet: cpsw: fix panic when interrupt coaleceing is set via ethtool
Alexander Lobakin <[email protected]>
ice: don't allow to run ice_send_event_to_aux() in atomic ctx
Alexander Lobakin <[email protected]>
ice: fix 'scheduling while atomic' on aux critical err interrupt
Miaoqian Lin <[email protected]>
mfd: asic3: Add missing iounmap() on error asic3_mfd_probe
Hoang Le <[email protected]>
tipc: fix the timer expires after interval 100ms
Yang Yingliang <[email protected]>
net: wwan: qcom_bam_dmux: fix wrong pointer passed to IS_ERR()
Vladimir Oltean <[email protected]>
net: dsa: fix panic on shutdown if multi-chip tree failed to probe
Aaron Conole <[email protected]>
openvswitch: always update flow key after nat
Jakub Kicinski <[email protected]>
tcp: ensure PMTU updates are processed during fastopen
Jeremy Linton <[email protected]>
net: bcmgenet: Use stronger register read/writes to assure ordering
Bjorn Helgaas <[email protected]>
PCI: Avoid broken MSI on SB600 USB devices
Yafang Shao <[email protected]>
bpftool: Fix print error when show bpf map
Hangbin Liu <[email protected]>
selftests/bpf/test_lirc_mode2.sh: Exit with proper code
Lucas De Marchi <[email protected]>
drm/i915: Fix renamed struct field
Duoming Zhou <[email protected]>
ax25: Fix NULL pointer dereferences in ax25 timers
Duoming Zhou <[email protected]>
ax25: Fix refcount leaks caused by ax25_cb_del()
Michael Ellerman <[email protected]>
powerpc/pseries: Fix use after free in remove_phb_dynamic()
Peter Rosin <[email protected]>
i2c: mux: demux-pinctrl: do not deactivate a master that is not active
Phil Sutter <[email protected]>
netfilter: conntrack: Add and use nf_ct_set_auto_assign_helper_warned()
Lucas Tanure <[email protected]>
i2c: meson: Fix wrong speed use from probe
Petr Machata <[email protected]>
af_netlink: Fix shift out of bounds in group mask calculation
Yonglong Li <[email protected]>
mptcp: Fix crash due to tcp_tsorted_anchor was initialized before release skb
Guillaume Nault <[email protected]>
ipv4: Fix route lookups when handling ICMP redirects and PMTU updates
Dan Carpenter <[email protected]>
RDMA/nldev: Prevent underflow in nldev_stat_set_counter_dynamic_doit()
Yake Yang <[email protected]>
Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt
Niels Dossche <[email protected]>
Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed
Pavel Skripkin <[email protected]>
Bluetooth: hci_uart: add missing NULL check in h5_enqueue
Jakub Sitnicki <[email protected]>
selftests/bpf: Fix error reporting from sock_fields programs
Kuniyuki Iwashima <[email protected]>
af_unix: Fix some data-races around unix_sk(sk)->oob_skb.
Sukadev Bhattiprolu <[email protected]>
ibmvnic: fix race between xmit and reset
Richard Zhu <[email protected]>
PCI: imx6: Assert i.MX8MM CLKREQ# even if no device present
Richard Zhu <[email protected]>
PCI: imx6: Invoke the PHY exit function after PHY power off
Hangbin Liu <[email protected]>
bareudp: use ipv6_mod_enabled to check if IPv6 enabled
Oliver Hartkopp <[email protected]>
can: isotp: support MSG_TRUNC flag when reading from socket
Oliver Hartkopp <[email protected]>
can: isotp: return -EADDRNOTAVAIL when reading from unbound socket
Lorenzo Bianconi <[email protected]>
mt76: mt7921: fix mt7921_queues_acq implementation
Pablo Neira Ayuso <[email protected]>
netfilter: flowtable: Fix QinQ and pppoe support for inet table
José Roberto de Souza <[email protected]>
drm/i915/display: Do not re-enable PSR after it was marked as not reliable
José Roberto de Souza <[email protected]>
drm/i915/display: Fix HPD short pulse handling for eDP
Nicholas Piggin <[email protected]>
powerpc/time: Fix KVM host re-arming a timer beyond decrementer range
Randy Dunlap <[email protected]>
powerpc/xive: fix return value of __setup handler
Bob Pearson <[email protected]>
RDMA/rxe: Fix ref error in rxe_av.c
Chengguang Xu <[email protected]>
RDMA/rxe: Change variable and function argument to proper type
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Fix double free during GPU reset on DC streams
Dan Carpenter <[email protected]>
USB: storage: ums-realtek: fix error code in rts51x_read_mem()
Niklas Söderlund <[email protected]>
samples/bpf, xdpsock: Fix race when running for fix duration of time
Wang Yufen <[email protected]>
bpf, sockmap: Fix double uncharge the mem of sk_msg
Wang Yufen <[email protected]>
bpf, sockmap: Fix more uncharged while msg has more_data
Wang Yufen <[email protected]>
bpf, sockmap: Fix memleak in tcp_bpf_sendmsg while sk msg is full
Wang Yufen <[email protected]>
bpf, sockmap: Fix memleak in sk_psock_queue_msg
Yongzhi Liu <[email protected]>
RDMA/mlx5: Fix memory leak in error flow for subscribe event routine
Leon Romanovsky <[email protected]>
Revert "RDMA/core: Fix ib_qp_usecnt_dec() called when error"
Dan Carpenter <[email protected]>
RDMA/irdma: Prevent some integer underflows
Linus Walleij <[email protected]>
power: ab8500_chargalg: Use CLOCK_MONOTONIC
Xin Xiong <[email protected]>
mtd: rawnand: atmel: fix refcount issue in atmel_nand_controller_init
Yaliang Wang <[email protected]>
MIPS: pgalloc: fix memory leak caused by pgd_free()
Randy Dunlap <[email protected]>
MIPS: RB532: fix return value of __setup handler
Miaoqian Lin <[email protected]>
mips: cdmm: Fix refcount leak in mips_cdmm_phys_base
Miaoqian Lin <[email protected]>
ath10k: Fix error handling in ath10k_setup_msa_resources
Oliver Hartkopp <[email protected]>
vxcan: enable local echo for sent CAN frames
Johannes Berg <[email protected]>
iwlwifi: pcie: fix SW error MSI-X mapping
Max Filippov <[email protected]>
xtensa: add missing XCHAL_HAVE_WINDOWED check
Hangyu Hua <[email protected]>
powerpc: 8xx: fix a return value error in mpc8xx_pic_init
Sreekanth Reddy <[email protected]>
scsi: mpt3sas: Fix incorrect 4GB boundary check
Jia-Ju Bai <[email protected]>
platform/x86: huawei-wmi: check the return value of device_create_file()
Felix Maurer <[email protected]>
selftests/bpf: Make test_lwt_ip_encap more stable and faster
lic121 <[email protected]>
libbpf: Unmap rings when umem deleted
Jiasheng Jiang <[email protected]>
mfd: mc13xxx: Add check for mc13xxx_irq_request
Michael Ellerman <[email protected]>
powerpc/64s: Don't use DSISR for SLB faults
Jakob Koschel <[email protected]>
powerpc/sysdev: fix incorrect use to determine if list is empty
Maciej W. Rozycki <[email protected]>
MIPS: Sanitise Cavium switch cases in TLB handler synthesizers
Randy Dunlap <[email protected]>
mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n
Rob Clark <[email protected]>
drm/msm/a6xx: Fix missing ARRAY_SIZE() check
Robert Hancock <[email protected]>
net: axienet: fix RX ring refill allocation failure handling
Mark Tomlinson <[email protected]>
PCI: Reduce warnings on possible RW1C corruption
Yajun Deng <[email protected]>
RDMA/core: Fix ib_qp_usecnt_dec() called when error
Mike Marciniszyn <[email protected]>
IB/hfi1: Allow larger MTU without AIP
Jiasheng Jiang <[email protected]>
power: supply: wm8350-power: Add missing free in free_charger_irq
Jiasheng Jiang <[email protected]>
power: supply: wm8350-power: Handle error for wm8350_register_irq
Radoslaw Biernacki <[email protected]>
Bluetooth: Fix skb allocation in mgmt_remote_name() & mgmt_device_connected()
Tom Rix <[email protected]>
Bluetooth: hci_sync: fix undefined return of hci_disconnect_all_sync()
Divya Koppera <[email protected]>
net: phy: micrel: Fix concurrent register access
Robert Hancock <[email protected]>
i2c: xiic: Make bus names unique
Mark Brown <[email protected]>
KVM: arm64: Enable Cortex-A510 erratum 2077057 by default
Anssi Hannula <[email protected]>
hv_balloon: rate-limit "Unhandled message" warning
Sean Christopherson <[email protected]>
KVM: SVM: Exit to userspace on ENOMEM/EFAULT GHCB errors
Hou Wenlong <[email protected]>
KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor()
Zhenzhong Duan <[email protected]>
KVM: x86: Fix emulation in writing cr8
Michael Ellerman <[email protected]>
powerpc/Makefile: Don't pass -mcpu=powerpc64 when building 32-bit
Daniel Henrique Barboza <[email protected]>
powerpc/mm/numa: skip NUMA_NO_NODE onlining in parse_numa_properties()
Xu Kuohai <[email protected]>
libbpf: Skip forward declaration when counting duplicated type names
Christophe JAILLET <[email protected]>
gpu: host1x: Fix a memory leak in 'host1x_remove()'
Christophe JAILLET <[email protected]>
gpu: host1x: Fix an error handling path in 'host1x_probe()'
Stijn Tintel <[email protected]>
libbpf: Fix BPF_MAP_TYPE_PERF_EVENT_ARRAY auto-pinning
Mustafa Ismail <[email protected]>
RDMA/irdma: Remove incorrect masking of PD
Mustafa Ismail <[email protected]>
RDMA/irdma: Fix Passthrough mode in VM
Mustafa Ismail <[email protected]>
RDMA/irdma: Fix netdev notifications for vlan's
Magnus Karlsson <[email protected]>
xsk: Fix race at socket teardown
Hou Tao <[email protected]>
bpf, arm64: Feed byte-offset into bpf line info
Hou Tao <[email protected]>
bpf, arm64: Call build_prologue() first in first JIT pass
Nishanth Menon <[email protected]>
drm/bridge: cdns-dsi: Make sure to to create proper aliases for dt
Xiang Chen <[email protected]>
scsi: hisi_sas: Change permission of parameter prot_mask
Hans de Goede <[email protected]>
power: supply: bq24190_charger: Fix bq24190_vbus_is_enabled() wrong false return
Miaoqian Lin <[email protected]>
drm/tegra: Fix reference leak in tegra_dsi_ganged_probe
Zhang Yi <[email protected]>
ext2: correct max file size computing
Kees Cook <[email protected]>
drm/dp: Fix OOB read when handling Post Cursor2 register
MeiChia Chiu <[email protected]>
mt76: mt7915: fix the muru tlv issue
Bo Jiao <[email protected]>
mt76: mt7915: enlarge wcid size to 544
Christophe JAILLET <[email protected]>
power: supply: sbs-charger: Don't cancel work that is not initialized
Randy Dunlap <[email protected]>
TOMOYO: fix __setup handlers return values
Maíra Canal <[email protected]>
drm/amd/display: Remove vupdate_int_entry definition
Aharon Landau <[email protected]>
RDMA/mlx5: Fix the flow of a miss in the allocation of a cache ODP MR
Luiz Angelo Daros de Luca <[email protected]>
net: dsa: realtek-smi: move to subdirectory
Luiz Angelo Daros de Luca <[email protected]>
net: dsa: realtek-smi: fix kdoc warnings
Deren Wu <[email protected]>
mt76: mt7921s: fix missing fc type/sub-type for 802.11 pkts
Lorenzo Bianconi <[email protected]>
mt76: fix endianness errors in reverse_frag0_hdr_trans
Lorenzo Bianconi <[email protected]>
mt76: do not always copy ethhdr in reverse_frag0_hdr_trans
Damien Le Moal <[email protected]>
scsi: pm8001: Fix abort all task initialization
Damien Le Moal <[email protected]>
scsi: pm8001: Fix NCQ NON DATA command completion handling
Damien Le Moal <[email protected]>
scsi: pm8001: Fix NCQ NON DATA command task initialization
Damien Le Moal <[email protected]>
scsi: pm8001: Fix le32 values handling in pm80xx_chip_sata_req()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix le32 values handling in pm80xx_chip_ssp_io_req()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix payload initialization in pm80xx_encrypt_update()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix le32 values handling in pm80xx_set_sas_protocol_timer_config()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix payload initialization in pm80xx_set_thermal_config()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix command initialization in pm8001_chip_ssp_tm_req()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix command initialization in pm80XX_send_read_log()
Bart Van Assche <[email protected]>
scsi: fnic: Fix a tracing statement
Abhishek Sahu <[email protected]>
vfio/pci: wake-up devices around reset functions
Abhishek Sahu <[email protected]>
vfio/pci: fix memory leak during D3hot to D0 transition
Aashish Sharma <[email protected]>
dm crypt: fix get_key_size compiler warning if !CONFIG_KEYS
Nemanja Rakovic <[email protected]>
mips: Enable KCSAN
Rameshkumar Sundaram <[email protected]>
ath11k: Invalidate cached reo ring entry before accessing it
Alexander Lobakin <[email protected]>
i40e: remove dead stores on XSK hotpath
Dmitry Baryshkov <[email protected]>
drm/msm/dp: fix panel bridge attachment
Dmitry Baryshkov <[email protected]>
drm/msm/dpu: remove msm_dp cached in dpu_encoder_virt
Dmitry Baryshkov <[email protected]>
drm/msm/dpu: fix dp audio condition
Dmitry Baryshkov <[email protected]>
drm/msm/dpu: add DSPP blocks teardown
Dmitry Baryshkov <[email protected]>
drm/msm/dsi/phy: fix 7nm v4.0 settings for C-PHY mode
Marijn Suijten <[email protected]>
drm/msm/dsi: Use "ref" fw clock instead of global name for VCO parent
Kuogee Hsieh <[email protected]>
drm/msm/dp: always add fail-safe mode into connector mode list
Kuogee Hsieh <[email protected]>
drm/msm/dp: stop link training after link training 2 failed
Kuogee Hsieh <[email protected]>
drm/msm/dp: populate connector of struct dp_panel
Kuogee Hsieh <[email protected]>
drm/msm/dp: do not initialize phy until plugin interrupt received
Amit Kumar Mahapatra <[email protected]>
mtd: rawnand: pl353: Set the nand chip node as the flash node
Dan Carpenter <[email protected]>
iwlwifi: mvm: Fix an error code in iwl_mvm_up()
Colin Ian King <[email protected]>
iwlwifi: Fix -EIO error code that is never returned
Dan Carpenter <[email protected]>
iwlwifi: mvm: fix off by one in iwl_mvm_stat_iterator_all_macs()
Mukesh Sisodiya <[email protected]>
iwlwifi: yoyo: Avoid using dram data if allocation failed
Rotem Saado <[email protected]>
iwlwifi: yoyo: remove DBGI_SRAM address reset writing
Johannes Berg <[email protected]>
iwlwifi: mvm: align locking in D3 test debugfs
Luca Coelho <[email protected]>
iwlwifi: mvm: don't iterate unadded vifs when handling FW SMPS req
Takashi Iwai <[email protected]>
iwlwifi: mvm: Don't call iwl_mvm_sta_from_mac80211() with NULL sta
Geliang Tang <[email protected]>
selftests: mptcp: add csum mib check for mptcp_connect
Tong Zhang <[email protected]>
dax: make sure inodes are flushed before destroy cache
Dan Williams <[email protected]>
cxl/port: Hold port reference until decoder release
Dan Williams <[email protected]>
cxl/core/port: Rename bus.c to port.c
Håkon Bugge <[email protected]>
IB/cma: Allow XRC INI QPs to set their local ACK timeout
Andrii Nakryiko <[email protected]>
libbpf: Fix memleak in libbpf_netlink_recv()
Jiri Olsa <[email protected]>
bpftool: Fix pretty print dump for maps without BTF loaded
Roman Li <[email protected]>
drm/amd/display: Add affected crtcs to atomic state for dsc mst unplug
Yiqing Yao <[email protected]>
drm/amd/pm: enable pm sysfs write for one VF mode
Yinjun Zhang <[email protected]>
bpftool: Fix the error when lookup in no-btf maps
Martin Povišer <[email protected]>
i2c: pasemi: Drop I2C classes from platform driver variant
Wen Gong <[email protected]>
ath11k: fix uninitialized rate_idx in ath11k_dp_tx_update_txcompl()
Pin-Yen Lin <[email protected]>
drm/bridge: anx7625: Fix overflow issue on reading EDID
Jiasheng Jiang <[email protected]>
iommu/ipmmu-vmsa: Check for error num after setting mask
Dmitry Torokhov <[email protected]>
HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports
Miaoqian Lin <[email protected]>
power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init
Toke Høiland-Jørgensen <[email protected]>
libbpf: Use dynamically allocated buffer when receiving netlink messages
Andrii Nakryiko <[email protected]>
libbpf: Fix libbpf.map inheritance chain for LIBBPF_0.7.0
Linus Walleij <[email protected]>
power: supply: ab8500: Swap max and overvoltage
Neil Armstrong <[email protected]>
drm/bridge: dw-hdmi: use safe format when first in bridge chain
Dan Carpenter <[email protected]>
rtw88: fix use after free in rtw_hw_scan_update_probe_req()
Andrii Nakryiko <[email protected]>
libbpf: Fix compilation warning due to mismatched printf format
Po Liu <[email protected]>
net:enetc: allocate CBD ring data memory using DMA coherent methods
Tianyu Lan <[email protected]>
Netvsc: Call hv_unmap_memory() in the netvsc_device_remove()
Jonathan Cameron <[email protected]>
cxl/regs: Fix size of CXL Capability Header Register
Dan Williams <[email protected]>
tools/testing/cxl: Fix root port to host bridge assignment
Dan Williams <[email protected]>
cxl/core: Fix cxl_probe_component_regs() error message
Ilya Leoshkevich <[email protected]>
libbpf: Fix riscv register names
Dan Carpenter <[email protected]>
libbpf: Fix signedness bug in btf_dump_array_data()
Xiao Yang <[email protected]>
RDMA/rxe: Check the last packet by RXE_END_MASK
Pali Rohár <[email protected]>
PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge
Pali Rohár <[email protected]>
PCI: aardvark: Fix reading MSI interrupt number
Luben Tuikov <[email protected]>
drm/amdgpu: Don't offset by 2 in FRU EEPROM
Corinna Vinschen <[email protected]>
igb: refactor XDP registration
Corinna Vinschen <[email protected]>
igc: avoid kernel warning when changing RX ring parameters
Naveen N. Rao <[email protected]>
selftests/bpf: Use "__se_" prefix on architectures without syscall wrapper
Kenta Tada <[email protected]>
selftests/bpf: Extract syscall wrapper
Mark Brown <[email protected]>
mtd: mchp48l640: Add SPI ID table
Mark Brown <[email protected]>
mtd: mchp23k256: Add SPI ID table
Christophe JAILLET <[email protected]>
i2c: bcm2835: Fix the error handling in 'bcm2835_i2c_probe()'
Pavel Skripkin <[email protected]>
net: asix: add proper error handling of usb read errors
Christophe Leroy <[email protected]>
livepatch: Fix build failure on 32 bits processors
Thomas Bracht Laumann Jespersen <[email protected]>
scripts/dtc: Call pkg-config POSIXly correct
Johannes Berg <[email protected]>
mac80211: limit bandwidth in HE capabilities
Yonghong Song <[email protected]>
bpf: Fix a btf decl_tag bug when tagging a function
Tobias Waldekranz <[email protected]>
net: dsa: mv88e6xxx: Enable port policy support on 6097
Miroslav Lichvar <[email protected]>
ptp: unregister virtual clocks when unregistering physical clock.
MeiChia Chiu <[email protected]>
mt76: mt7915: fix the nss setting in bitrates
Peter Chiu <[email protected]>
mt76: mt7915: fix mcs_map in mt7915_mcu_set_sta_he_mcs()
Lorenzo Bianconi <[email protected]>
mt76: mt7921s: fix a possible memory leak in mt7921_load_patch
Lorenzo Bianconi <[email protected]>
mt76: mt7915: fix possible memory leak in mt7915_mcu_add_sta
Lorenzo Bianconi <[email protected]>
mt76: mt7615: check sta_rates pointer in mt7615_sta_rate_tbl_update
Lorenzo Bianconi <[email protected]>
mt76: mt7603: check sta_rates pointer in mt7603_sta_rate_tbl_update
Sean Wang <[email protected]>
mt76: mt7921e: fix possible probe failure after reboot
Leon Yen <[email protected]>
mt76: mt7921s: fix mt7921s_mcu_[fw|drv]_pmctrl
Peter Chiu <[email protected]>
mt76: mt7921: fix ht mcs in mt7921_mac_add_txs_skb()
Peter Chiu <[email protected]>
mt76: mt7915: fix ht mcs in mt7915_mac_add_txs_skb()
Lorenzo Bianconi <[email protected]>
mt76: mt7615: fix a leftover race in runtime-pm
Lorenzo Bianconi <[email protected]>
mt76: mt7921: fix a leftover race in runtime-pm
Lorenzo Bianconi <[email protected]>
mt76: mt7921: do not always disable fw runtime-pm
Sean Wang <[email protected]>
mt76: mt7921: set EDCA parameters with the MCU CE command
Sean Wang <[email protected]>
mt76: mt76_connac: fix MCU_CE_CMD_SET_ROC definition error
Lorenzo Bianconi <[email protected]>
mt76: mt7915: use proper aid value in mt7915_mcu_sta_basic_tlv
Lorenzo Bianconi <[email protected]>
mt76: mt7915: use proper aid value in mt7915_mcu_wtbl_generic_tlv in sta mode
Lorenzo Bianconi <[email protected]>
mt76: connac: fix sta_rec_wtbl tag len
Athira Rajeev <[email protected]>
powerpc/perf: Don't use perf_hw_context for trace IMC PMU
Fabiano Rosas <[email protected]>
KVM: PPC: Book3S HV: Check return value of kvmppc_radix_init
Maxim Kiselev <[email protected]>
powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch
Jiasheng Jiang <[email protected]>
ray_cs: Check ioremap return value
Miaoqian Lin <[email protected]>
power: reset: gemini-poweroff: Fix IRQ check in gemini_poweroff_probe
Alexander Lobakin <[email protected]>
ixgbe: respect metadata on XSK Rx to skb
Alexander Lobakin <[email protected]>
ixgbe: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
Alexander Lobakin <[email protected]>
ixgbe: pass bi->xdp to ixgbe_construct_skb_zc() directly
Alexander Lobakin <[email protected]>
igc: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
Alexander Lobakin <[email protected]>
ice: respect metadata on XSK Rx to skb
Alexander Lobakin <[email protected]>
ice: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
Alexander Lobakin <[email protected]>
i40e: respect metadata on XSK Rx to skb
Alexander Lobakin <[email protected]>
i40e: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
Christophe JAILLET <[email protected]>
drm/bridge: lt9611: Fix an error handling path in lt9611_probe()
Po-Hao Huang <[email protected]>
rtw88: fix memory overrun and memory leak during hw_scan
Po-Hao Huang <[email protected]>
rtw88: fix idle mode flow for hw scan
Muhammad Usama Anjum <[email protected]>
rtw88: check for validity before using a pointer
Gerhard Engleder <[email protected]>
selftests/net: timestamping: Fix bind_phc check
Fabiano Rosas <[email protected]>
KVM: PPC: Fix vmx/vsx mixup in mmio emulation
Maor Gottlieb <[email protected]>
RDMA/core: Set MR type in ib_reg_user_mr
Wen Gong <[email protected]>
ath11k: set WMI_PEER_40MHZ while peer assoc for 6 GHz
Pavel Skripkin <[email protected]>
ath9k_htc: fix uninit value bugs
Hangbin Liu <[email protected]>
selftests/bpf/test_xdp_redirect_multi: use temp netns for testing
Robert Hancock <[email protected]>
net: phy: at803x: move page selection fix to config_init
Tom Rix <[email protected]>
drm/amd/pm: return -ENOTSUPP if there is no get_dpm_ultimate_freq function
Zhou Qingyang <[email protected]>
drm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes()
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Call dc_stream_release for remove link enc assignment
Zhou Qingyang <[email protected]>
drm/nouveau/acr: Fix undefined behavior in nvkm_acr_hsfw_load_bl()
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_event: Fix HCI_EV_VENDOR max_len
Tobias Waldekranz <[email protected]>
net: dsa: Avoid cross-chip syncing of VLAN filtering
Tobias Waldekranz <[email protected]>
net: dsa: Move VLAN filtering syncing out of dsa_switch_bridge_leave
Brett Creeley <[email protected]>
ionic: Correctly print AQ errors if completions aren't received
Shannon Nelson <[email protected]>
ionic: fix up printing of timeout error
Brett Creeley <[email protected]>
ionic: Don't send reset commands if FW isn't running
Shannon Nelson <[email protected]>
ionic: start watchdog after all is setup
Shannon Nelson <[email protected]>
ionic: fix type complaint in ionic_dev_cmd_clean()
Maxime Ripard <[email protected]>
drm/edid: Split deep color modes between RGB and YUV444
Maxime Ripard <[email protected]>
drm/edid: Don't clear formats if using deep color
Magnus Karlsson <[email protected]>
selftests, xsk: Fix rx_full stats test
Dario Binacchi <[email protected]>
mtd: rawnand: gpmi: fix controller timings setting
Jiasheng Jiang <[email protected]>
mtd: onenand: Check for error irq
Sean Wang <[email protected]>
Bluetooth: btmtksdio: mask out interrupt status
Mark Chen <[email protected]>
Bluetooth: mt7921s: fix btmtksdio_[drv|fw]_pmctrl()
Mark Chen <[email protected]>
Bluetooth: btmtksdio: refactor btmtksdio_runtime_[suspend|resume]()
Mark Chen <[email protected]>
Bluetooth: mt7921s: fix bus hang with wrong privilege
Mark Chen <[email protected]>
Bluetooth: mt7921s: fix firmware coredump retrieve
Pavel Skripkin <[email protected]>
Bluetooth: hci_serdev: call init_rwsem() before p->open()
Tedd Ho-Jeong An <[email protected]>
Bluetooth: btintel: Fix WBS setting for Intel legacy ROM products
Felix Maurer <[email protected]>
selftests: bpf: Fix bind on used port
Jani Nikula <[email protected]>
drm/locking: fix drm_modeset_acquire_ctx kernel-doc
José Expósito <[email protected]>
drm/selftests/test-drm_dp_mst_helper: Fix memory leak in sideband_msg_req_encode_decode
Kumar Kartikeya Dwivedi <[email protected]>
bpf: Fix UAF due to race between btf_try_get_module and load_module
Pavel Skripkin <[email protected]>
udmabuf: validate ubuf->pagecount
Dan Carpenter <[email protected]>
ath11k: fix error code in ath11k_qmi_assign_target_mem_chunk()
Wei Fu <[email protected]>
bpftool: Only set obj->skeleton on complete success
Yafang Shao <[email protected]>
libbpf: Fix possible NULL pointer dereference when destroying skeleton
Mauricio Vásquez <[email protected]>
bpftool: Fix error check when calling hashmap__new()
Jiasheng Jiang <[email protected]>
drm/panfrost: Check for error num after setting mask
Wen Gong <[email protected]>
ath11k: free peer for station when disconnect from AP for QCA6390/WCN6855
Dan Carpenter <[email protected]>
Bluetooth: hci_sync: unlock on error in hci_inquiry_result_with_rssi_evt()
Jiasheng Jiang <[email protected]>
drm/v3d/v3d_drv: Check for error num after setting mask
Wen Gong <[email protected]>
ath10k: fix memory overwrite of the WoWLAN wakeup packet pattern
Yang Yingliang <[email protected]>
ath11k: add missing of_node_put() to avoid leak
Jagan Teki <[email protected]>
drm: bridge: adv7511: Fix ADV7535 HPD enablement
Miaoqian Lin <[email protected]>
drm/bridge: nwl-dsi: Fix PM disable depth imbalance in nwl_dsi_probe
Miaoqian Lin <[email protected]>
drm/bridge: Add missing pm_runtime_disable() in __dw_mipi_dsi_probe
Miaoqian Lin <[email protected]>
drm/bridge: Fix free wrong object in sii8620_init_rcp_input_dev
Martin Blumenstingl <[email protected]>
drm/meson: Fix error handling when afbcd.ops->init fails
Martin Blumenstingl <[email protected]>
drm/meson: osd_afbcd: Add an exit callback to struct meson_afbcd_ops
Christophe JAILLET <[email protected]>
drm/bridge: sn65dsi83: Fix an error handling path in sn65dsi83_probe()
Andre Przywara <[email protected]>
ARM: configs: multi_v5_defconfig: re-enable DRM_PANEL and FB_xxx
Andre Przywara <[email protected]>
ARM: configs: multi_v5_defconfig: re-enable CONFIG_V4L_PLATFORM_DRIVERS
Meng Tang <[email protected]>
ASoC: amd: Fix reference to PCM buffer address
Miaoqian Lin <[email protected]>
ASoC: codecs: wcd934x: Add missing of_node_put() in wcd934x_codec_parse_data
Miaoqian Lin <[email protected]>
ASoC: mediatek: mt8195: Fix error handling in mt8195_mt6359_rt1019_rt5682_dev_probe
Miaoqian Lin <[email protected]>
ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe
Miaoqian Lin <[email protected]>
ASoC: atmel: Fix error handling in sam9x5_wm8731_driver_probe
zhangqilong <[email protected]>
ASoC: rockchip: Fix PM usage reference of rockchip_i2s_tdm_resume
Daniel Bristot de Oliveira <[email protected]>
rtla/osnoise: Fix osnoise hist stop tracing message
Jiasheng Jiang <[email protected]>
mmc: davinci_mmc: Handle error for clk_enable
Miaoqian Lin <[email protected]>
ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe
Kai Vehmanen <[email protected]>
ASoC: SOF: Intel: enable DMI L1 for playback streams
Wang Wensheng <[email protected]>
ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
Shengjiu Wang <[email protected]>
ASoC: fsl_spdif: Disable TX clock when stop
Miaoqian Lin <[email protected]>
ASoC: mxs: Fix error handling in mxs_sgtl5000_probe
Codrin Ciubotariu <[email protected]>
ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Miaoqian Lin <[email protected]>
ASoC: rk817: Fix missing clk_disable_unprepare() in rk817_platform_probe
Miaoqian Lin <[email protected]>
ASoC: mediatek: mt8192-mt6359: Fix error handling in mt8192_mt6359_dev_probe
Miaoqian Lin <[email protected]>
ASoC: SOF: Add missing of_node_put() in imx8m_probe
Miaoqian Lin <[email protected]>
ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
Miaoqian Lin <[email protected]>
ASoC: atmel: Fix error handling in snd_proto_probe
Hans Verkuil <[email protected]>
ivtv: fix incorrect device_caps for ivtvfb
Jakob Koschel <[email protected]>
media: saa7134: fix incorrect use to determine if list is empty
Miaoqian Lin <[email protected]>
video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
Jiasheng Jiang <[email protected]>
ASoC: fsi: Add check for clk_enable
Jiasheng Jiang <[email protected]>
ASoC: wm8350: Handle error for wm8350_register_irq
Miaoqian Lin <[email protected]>
ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe
Lucas Tanure <[email protected]>
ASoC: cs35l41: Fix max number of TX channels
David Rhodes <[email protected]>
ASoC: cs35l41: Fix GPIO2 configuration
Jiasheng Jiang <[email protected]>
media: vidtv: Check for null return of vzalloc
Dafna Hirschfeld <[email protected]>
media: stk1160: If start stream fails, return buffers with VB2_BUF_STATE_QUEUED
Randy Dunlap <[email protected]>
m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined
Rob Herring <[email protected]>
arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly
Takashi Sakamoto <[email protected]>
ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction
Jia-Ju Bai <[email protected]>
memory: emif: check the pointer temp in get_device_details()
Jiasheng Jiang <[email protected]>
memory: emif: Add check for setup_interrupts
Daniel Scally <[email protected]>
media: i2c: Fix pixel array positions in ov8865
Jiasheng Jiang <[email protected]>
ASoC: soc-compress: prevent the potentially use of null pointer
Jiasheng Jiang <[email protected]>
ASoC: dwc-i2s: Handle errors for clk_enable
Jiasheng Jiang <[email protected]>
ASoC: atmel_ssc_dai: Handle errors for clk_enable
Jiasheng Jiang <[email protected]>
ASoC: mxs-saif: Handle errors for clk_enable
Randy Dunlap <[email protected]>
printk: fix return value of printk.devkmsg __setup handler
Frank Wunderlich <[email protected]>
arm64: dts: broadcom: Fix sata nodename
Kuldeep Singh <[email protected]>
arm64: dts: ns2: Fix spi-cpol and spi-cpha property
Jiasheng Jiang <[email protected]>
ALSA: spi: Add check for clk_enable()
Jiasheng Jiang <[email protected]>
ASoC: ti: davinci-i2s: Add check for clk_enable()
Aswath Govindraju <[email protected]>
mmc: sdhci_am654: Fix the driver data of AM64 SoC
Chun-Jie Chen <[email protected]>
soc: mediatek: pm-domains: Add wakeup capacity support in power domain
Jia-Ju Bai <[email protected]>
ASoC: acp: check the return value of devm_kzalloc() in acp_legacy_dai_links_create()
Jia-Ju Bai <[email protected]>
ASoC: rt5663: check the return value of devm_kzalloc() in rt5663_parse_dp()
Arnd Bergmann <[email protected]>
uaccess: fix nios2 and microblaze get_user_8()
Christophe Leroy <[email protected]>
vsprintf: Fix %pK with kptr_restrict == 0
Muhammad Usama Anjum <[email protected]>
selftests/lkdtm: Add UBSAN config
Muhammad Usama Anjum <[email protected]>
selftests: vm: remove dependecy from internal kernel macros
Mirela Rabulea <[email protected]>
media: ov5640: Fix set format, v4l2_mbus_pixelcode not updated
Jernej Skrabec <[email protected]>
media: hantro: sunxi: Fix VP9 steps
Nicolas Dufresne <[email protected]>
media: v4l2-core: Initialize h264 scaling matrix
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd934x: fix kcontrol max values
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd938x: fix kcontrol max values
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wc938x: fix accessing array out of bounds for enum type
Srinivas Kandagatla <[email protected]>
ASoC: codecs: va-macro: fix accessing array out of bounds for enum type
Srinivas Kandagatla <[email protected]>
ASoC: codecs: rx-macro: fix accessing array out of bounds for enum type
Srinivas Kandagatla <[email protected]>
ASoC: codecs: rx-macro: fix accessing compander for aux
Keerthy <[email protected]>
arm64: dts: ti: k3-j721s2-mcu-wakeup: Fix the interrupt-parent for wkup_gpioX instances
Jernej Skrabec <[email protected]>
media: cedrus: h264: Fix neighbour info buffer size
Jernej Skrabec <[email protected]>
media: cedrus: H265: Fix neighbour info buffer size
Dan Carpenter <[email protected]>
media: usb: go7007: s2250-board: fix leak in probe()
Yunfei Dong <[email protected]>
media: uapi: Init VP9 stateless decode params
Dongliang Mu <[email protected]>
media: em28xx: initialize refcount before kref_get
Zhou Qingyang <[email protected]>
media: ti-vpe: cal: Fix a NULL pointer dereference in cal_ctx_v4l2_init_formats()
Tom Rix <[email protected]>
media: video/hdmi: handle short reads of hdmi info frame.
Neil Armstrong <[email protected]>
media: mexon-ge2d: fixup frames size in registers
Marek Vasut <[email protected]>
ARM: dts: imx: Add missing LVDS decoder on M53Menlo
Manivannan Sadhasivam <[email protected]>
ARM: dts: qcom: sdx55: Fix the address used for PCIe EP local addr space
Andy Shevchenko <[email protected]>
vsprintf: Fix potential unaligned access
Ard Biesheuvel <[email protected]>
ARM: ftrace: ensure that ADR takes the Thumb bit into account
Olivier Moysan <[email protected]>
ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
Paul Kocialkowski <[email protected]>
ARM: dts: sun8i: v3s: Move the csi1 block to follow address order
Stephan Gerhold <[email protected]>
cpuidle: qcom-spm: Check if any CPU is managed by SPM
Miaoqian Lin <[email protected]>
soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
Christophe JAILLET <[email protected]>
firmware: ti_sci: Fix compilation failure when CONFIG_TI_SCI_PROTOCOL is not defined
Baruch Siach <[email protected]>
arm64: dts: qcom: ipq6018: fix usb reference period
Petr Vorel <[email protected]>
arm64: dts: qcom: msm8994: Provide missing "xo_board" and "sleep_clk" to GCC
Maulik Shah <[email protected]>
arm64: dts: qcom: sm8450: Update cpuidle states parameters
Maulik Shah <[email protected]>
arm64: dts: qcom: sm8350: Correct TCS configuration for apps rsc
Maulik Shah <[email protected]>
arm64: dts: qcom: sm8150: Correct TCS configuration for apps rsc
Rafał Miłecki <[email protected]>
arm64: dts: broadcom: bcm4908: use proper TWD binding
Petr Vorel <[email protected]>
arm64: dts: qcom: msm8916-j5: Fix typo
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8250: fix PCIe bindings to follow schema
David Heidelberg <[email protected]>
arm64: dts: qcom: sdm845: fix microphone bias properties and values
Daniel Thompson <[email protected]>
soc: qcom: aoss: remove spurious IRQF_ONESHOT flags
Miaoqian Lin <[email protected]>
soc: qcom: aoss: Fix missing put_device call in qmp_get
Miaoqian Lin <[email protected]>
soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem
Jiasheng Jiang <[email protected]>
soc: qcom: rpmpd: Check for null return of devm_kcalloc
Pavel Kubelun <[email protected]>
ARM: dts: qcom: ipq4019: fix sleep clock
Marijn Suijten <[email protected]>
firmware: qcom: scm: Remove reassignment to desc following initializer
Douglas Anderson <[email protected]>
arm64: dts: qcom: sc7280: Fix gmu unit address
Randy Dunlap <[email protected]>
ASoC: max98927: add missing header file
Zev Weiss <[email protected]>
ARM: dts: Fix OpenBMC flash layout label addresses
Dan Carpenter <[email protected]>
video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
Dan Carpenter <[email protected]>
video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
Wang Hai <[email protected]>
video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
YueHaibing <[email protected]>
video: fbdev: controlfb: Fix COMPILE_TEST build
Z. Liu <[email protected]>
video: fbdev: matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid black screen
Jammy Huang <[email protected]>
media: aspeed: Correct value for h-total-pixels
Bingbu Cao <[email protected]>
media: ov2740: identify module after subdev initialisation
Sakari Ailus <[email protected]>
media: ov5648: Don't pack controls struct
Sakari Ailus <[email protected]>
media: v4l: Avoid unaligned access warnings when printing 4cc modifiers
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix set format try processing path
Chen-Yu Tsai <[email protected]>
media: hantro: Fix overfill bottom register field name
Jiasheng Jiang <[email protected]>
media: meson: vdec: potential dereference of null pointer
Miaoqian Lin <[email protected]>
media: coda: Fix missing put_device() call in coda_get_vdoa_data
Dmitry Osipenko <[email protected]>
memory: tegra20-emc: Correct memory device mask
Robert Hancock <[email protected]>
ASoC: simple-card-utils: Set sysclk on all components
Robert Hancock <[email protected]>
ASoC: xilinx: xlnx_formatter_pcm: Handle sysclk setting
Jiasheng Jiang <[email protected]>
ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio
Lad Prabhakar <[email protected]>
ASoC: sh: rz-ssi: Drop calling rz_ssi_pio_recv() recursively
Eugen Hristev <[email protected]>
media: atmel: atmel-sama7g5-isc: fix ispck leftover
Ondrej Zary <[email protected]>
media: bttv: fix WARNING regression on tunerless devices
Martin Kepplinger <[email protected]>
media: imx: imx8mq-mipi_csi2: fix system resume
Martin Kepplinger <[email protected]>
media: imx: imx8mq-mipi-csi2: remove wrong irq config write operation
Jiasheng Jiang <[email protected]>
media: mtk-vcodec: potential dereference of null pointer
Chen-Yu Tsai <[email protected]>
media: v4l2-mem2mem: Apply DST_QUEUE_OFF_BASE on MMAP buffers across ioctls
Laurent Pinchart <[email protected]>
media: staging: media: imx: imx7-mipi-csis: Make subdev name unique
Jonathan Marek <[email protected]>
media: camss: vfe-170: fix "VFE halt timeout" error
Jonathan Marek <[email protected]>
media: camss: csid-170: set the right HALT_CMD when disabled
Jonathan Marek <[email protected]>
media: camss: csid-170: don't enable unused irqs
Jonathan Marek <[email protected]>
media: camss: csid-170: fix non-10bit formats
Corentin Labbe <[email protected]>
media: staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size
Sam Protsenko <[email protected]>
pinctrl: samsung: Remove EINT handler for Exynos850 ALIVE and CMGP gpios
Peng Liu <[email protected]>
kunit: make kunit_test_timeout compatible with comment
David Hildenbrand <[email protected]>
drivers/base/memory: add memory block to memory group after registration succeeded
Guillaume Tucker <[email protected]>
selftests, x86: fix how check_cc.sh is being invoked
Shyam Prasad N <[email protected]>
cifs: use a different reconnect helper for non-cifsd threads
Fengnan Chang <[email protected]>
f2fs: fix compressed file start atomic write may cause data corruption
Dongliang Mu <[email protected]>
fs: erofs: add sanity check for kobject in erofs_unregister_sysfs
Matthew Wilcox (Oracle) <[email protected]>
iomap: Fix iomap_invalidatepage tracepoint
Filipe Manana <[email protected]>
btrfs: fix unexpected error path when reflinking an inline extent
Chao Yu <[email protected]>
f2fs: fix to avoid potential deadlock
Valentin Schneider <[email protected]>
sched/rt: Plug rt_mutex_setprio() vs push_rt_task() race
Chengming Zhou <[email protected]>
sched/cpuacct: Fix charge percpu cpuusage
Amir Goldstein <[email protected]>
nfsd: more robust allocation failure handling in nfsd_file_cache_init
Lukas Czerner <[email protected]>
ext4: fix remount with 'abort' option
Jaegeuk Kim <[email protected]>
f2fs: fix missing free nid in f2fs_handle_failed_inode
Mel Gorman <[email protected]>
sched/fair: Improve consistency of allowed NUMA balance calculations
Adrian Hunter <[email protected]>
perf/x86/intel/pt: Fix address filter config for 32-bit kernel
Adrian Hunter <[email protected]>
perf/core: Fix address filter parser for multiple filters
Mathieu Desnoyers <[email protected]>
rseq: Remove broken uapi field layout on 32-bit little endian
Qais Yousef <[email protected]>
sched/uclamp: Fix iowait boost escaping uclamp restriction
Qais Yousef <[email protected]>
sched/sugov: Ignore 'busy' filter when rq is capped by uclamp_max
Qais Yousef <[email protected]>
sched/core: Export pelt_thermal_tp
Bharata B Rao <[email protected]>
sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa
Chao Yu <[email protected]>
f2fs: fix to enable ATGC correctly via gc_idle sysfs interface
David Howells <[email protected]>
watch_queue: Actually free the watch
David Howells <[email protected]>
watch_queue: Fix NULL dereference in error cleanup
Jens Axboe <[email protected]>
io_uring: terminate manual loop iterator loop correctly for non-vecs
Jens Axboe <[email protected]>
io_uring: don't check unrelated req->open.how in accept request
Randy Dunlap <[email protected]>
clocksource: acpi_pm: fix return value of __setup handler
Brandon Wyman <[email protected]>
hwmon: (pmbus) Add Vin unit off handling
Miaoqian Lin <[email protected]>
hwrng: nomadik - Change clk_disable to clk_disable_unprepare
Giovanni Cabiddu <[email protected]>
crypto: qat - fix initialization of pfvf rts_map_msg structures
Giovanni Cabiddu <[email protected]>
crypto: qat - fix initialization of pfvf cap_msg structures
Jianglei Nie <[email protected]>
crypto: ccree - Fix use after free in cc_cipher_exit()
Dāvis Mosāns <[email protected]>
crypto: ccp - ccp_dmaengine_unregister release dma channels
Randy Dunlap <[email protected]>
ACPI: APEI: fix return value of __setup handlers
Dave Kleikamp <[email protected]>
KEYS: trusted: Avoid calling null function trusted_key_exit
Andreas Rammhold <[email protected]>
KEYS: trusted: Fix trusted key backends when building as module
Robin Murphy <[email protected]>
perf/arm-cmn: Update watchpoint format
Robin Murphy <[email protected]>
perf/arm-cmn: Hide XP PUB events for CMN-600
Mark Rutland <[email protected]>
arm64: prevent instrumentation of bp hardening callbacks
Guillaume Ranquet <[email protected]>
clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init()
Claudiu Beznea <[email protected]>
clocksource/drivers/timer-microchip-pit64b: Use notrace
Krzysztof Kozlowski <[email protected]>
clocksource/drivers/exynos_mct: Handle DTS with higher number of interrupts
Drew Fustini <[email protected]>
clocksource/drivers/timer-ti-dm: Fix regression from errata i940 fix
Petr Vorel <[email protected]>
crypto: vmx - add missing dependencies
Corentin Labbe <[email protected]>
crypto: gemini - call finalize with bh disabled
Corentin Labbe <[email protected]>
crypto: amlogic - call finalize with bh disabled
Corentin Labbe <[email protected]>
crypto: sun8i-ce - call finalize with bh disabled
Corentin Labbe <[email protected]>
crypto: sun8i-ss - call finalize with bh disabled
Claudiu Beznea <[email protected]>
hwrng: atmel - disable trng on failure path
Jiasheng Jiang <[email protected]>
spi: spi-zynqmp-gqspi: Handle error for dma_set_mask
Randy Dunlap <[email protected]>
PM: suspend: fix return value of __setup handler
Randy Dunlap <[email protected]>
PM: hibernate: fix __setup handler error handling
Eric Biggers <[email protected]>
block: don't delete queue kobject before its children
Christoph Hellwig <[email protected]>
nvme: fix the check for duplicate unique identifiers
Christoph Hellwig <[email protected]>
nvme: cleanup __nvme_check_ids
Armin Wolf <[email protected]>
hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING
Patrick Rudolph <[email protected]>
hwmon: (pmbus) Add mutex to regulator ops
Andy Shevchenko <[email protected]>
spi: pxa2xx-pci: Balance reference count for PCI DMA device
Kai Ye <[email protected]>
crypto: hisilicon/sec - fix the aead software fallback for engine
Gilad Ben-Yossef <[email protected]>
crypto: ccree - don't attempt 0 len DMA mappings
Randy Dunlap <[email protected]>
EVM: fix the evm= __setup handler return value
Richard Guy Briggs <[email protected]>
audit: log AUDIT_TIME_* records only from rules
Zhang Wensheng <[email protected]>
block: update io_ticks when io hang
Corentin Labbe <[email protected]>
crypto: rockchip - ECB does not need IV
Muhammad Usama Anjum <[email protected]>
selftests/sgx: Treat CC as one argument
Muhammad Usama Anjum <[email protected]>
selftests/x86: Add validity check and allow field splitting
Chengming Zhou <[email protected]>
blk-cgroup: set blkg iostat after percpu stat aggregation
Ondrej Mosnacek <[email protected]>
security: implement sctp_assoc_established hook in selinux
Ondrej Mosnacek <[email protected]>
security: add sctp_assoc_established hook
Jianyong Wu <[email protected]>
arm64/mm: avoid fixmap race condition when create pud mapping
Marco Elver <[email protected]>
stack: Constrain and fix stack offset randomization with Clang builds
Reinette Chatre <[email protected]>
selftests/sgx: Ensure enclave data available during debug print
Reinette Chatre <[email protected]>
selftests/sgx: Do not attempt enclave build without valid enclave
Reinette Chatre <[email protected]>
selftests/sgx: Fix NULL-pointer-dereference upon early test failure
Geert Uytterhoeven <[email protected]>
perf: MARVELL_CN10K_TAD_PMU should depend on ARCH_THUNDER
Miaoqian Lin <[email protected]>
spi: tegra210-quad: Fix missin IRQ check in tegra_qspi_probe
Miaoqian Lin <[email protected]>
spi: tegra114: Add missing IRQ check in tegra_spi_probe
Shijith Thotton <[email protected]>
crypto: octeontx2 - remove CONFIG_DM_CRYPT check
Jiasheng Jiang <[email protected]>
thermal: int340x: Check for NULL after calling kmemdup()
Scott Mayhew <[email protected]>
selinux: Fix selinux_sb_mnt_opts_compat()
Tomas Paukrt <[email protected]>
crypto: mxs-dcp - Fix scatterlist processing
Shijith Thotton <[email protected]>
crypto: octeontx2 - select CONFIG_NET_DEVLINK
Herbert Xu <[email protected]>
crypto: authenc - Fix sleep in atomic context in decrypt_tail
Giovanni Cabiddu <[email protected]>
crypto: qat - fix access to PFVF interrupt registers for GEN4
Herbert Xu <[email protected]>
crypto: kdf - Select hmac in addition to sha256
Corentin Labbe <[email protected]>
crypto: sun8i-ss - really disable hash on A80
Geert Uytterhoeven <[email protected]>
hwrng: cavium - HW_RANDOM_CAVIUM should depend on ARCH_THUNDER
Dan Carpenter <[email protected]>
crypto: qat - fix a signedness bug in get_service_enabled()
Peter Gonda <[email protected]>
crypto: ccp - Ensure psp_ret is always init'd in __sev_platform_init_locked()
Christian Göttsche <[email protected]>
selinux: check return value of sel_make_avc_files
GONG, Ruiqi <[email protected]>
selinux: access superblock_security_struct in LSM blob way
kernel test robot <[email protected]>
regulator: qcom_smd: fix for_each_child.cocci warnings
Marc Zyngier <[email protected]>
PCI: xgene: Revert "PCI: xgene: Fix IB window setup"
Marc Zyngier <[email protected]>
PCI: xgene: Revert "PCI: xgene: Use inbound resources for setup"
Liguang Zhang <[email protected]>
PCI: pciehp: Clear cmd_busy bit in polling mode
Fabio Estevam <[email protected]>
PCI: imx6: Allow to probe when dw_pcie_wait_for_link() fails
Mastan Katragadda <[email protected]>
drm/i915/gem: add missing boundary check in vm_access
Jani Nikula <[email protected]>
drm/i915/opregion: check port number bounds for SWSCI display power state
Hector Martin <[email protected]>
brcmfmac: pcie: Fix crashes due to early IRQs
Hector Martin <[email protected]>
brcmfmac: pcie: Replace brcmf_pcie_copy_mem_todev with memcpy_toio
Hector Martin <[email protected]>
brcmfmac: pcie: Declare missing firmware files in pcie.c
Hector Martin <[email protected]>
brcmfmac: pcie: Release firmwares in the brcmf_pcie_setup error path
Hector Martin <[email protected]>
brcmfmac: firmware: Allocate space for default boardrev in nvram
Thomas Zimmermann <[email protected]>
drm/fb-helper: Mark screen buffers in system memory with FBINFO_VIRTFB
Lyude Paul <[email protected]>
drm/nouveau/backlight: Just set all backlight types as RAW
Lyude Paul <[email protected]>
drm/nouveau/backlight: Fix LVDS backlight detection on some laptops
Christian König <[email protected]>
drm/syncobj: flatten dma_fence_chains on transfer
Claudio Imbrenda <[email protected]>
KVM: s390x: fix SCK locking
Max Filippov <[email protected]>
xtensa: fix xtensa_wsr always writing 0
Max Filippov <[email protected]>
xtensa: fix stop_machine_cpuslocked call in patch_text
Max Filippov <[email protected]>
xtensa: define update_mmu_tlb function
Qu Wenruo <[email protected]>
btrfs: verify the tranisd of the to-be-written dirty extent buffer
Niels Dossche <[email protected]>
btrfs: extend locking to all space_info members accesses
Naohiro Aota <[email protected]>
btrfs: zoned: mark relocation as writing
Paul Cercueil <[email protected]>
mips: Always permit to build u-boot images
Johan Hovold <[email protected]>
media: davinci: vpif: fix use-after-free on driver unbind
Johan Hovold <[email protected]>
media: davinci: vpif: fix unbalanced runtime PM enable
Johan Hovold <[email protected]>
media: davinci: vpif: fix unbalanced runtime PM get
Stanimir Varbanov <[email protected]>
media: venus: venc: Fix h264 8x8 transform control
Stanimir Varbanov <[email protected]>
media: venus: hfi_cmds: List HDR10 property as unsupported for v1 and v3
Ameer Hamza <[email protected]>
media: venus: vdec: fixed possible memory leak issue
Kees Cook <[email protected]>
media: omap3isp: Use struct_group() for memcpy() region
Sean Young <[email protected]>
media: gpio-ir-tx: fix transmit with long spaces on Orange Pi PC
Maciej W. Rozycki <[email protected]>
DEC: Limit PMAX memory probing to R3k systems
Shawn Guo <[email protected]>
PM: domains: Fix sleep-in-atomic bug caused by genpd_debug_remove()
Mingzhe Zou <[email protected]>
bcache: fixup multiple threads crash
Eric Biggers <[email protected]>
crypto: rsa-pkcs1pad - fix buffer overread in pkcs1pad_verify_complete()
Eric Biggers <[email protected]>
crypto: rsa-pkcs1pad - restore signature length check
Eric Biggers <[email protected]>
crypto: rsa-pkcs1pad - correctly get hash from source scatterlist
Eric Biggers <[email protected]>
crypto: rsa-pkcs1pad - only allow with rsa
Kees Cook <[email protected]>
exec: Force single empty string when argv is empty
Dirk Müller <[email protected]>
lib/raid6/test: fix multiple definition linking error
Srinivas Pandruvada <[email protected]>
thermal: int340x: Increase bitmap size
Jann Horn <[email protected]>
pstore: Don't use semaphores in always-atomic-context code
Colin Ian King <[email protected]>
carl9170: fix missing bit-wise or operator for tx_params
Jocelyn Falempe <[email protected]>
mgag200 fix memmapsl configuration in GCTL6 register
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: add missing HDMI supplies on SMDK5420
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: add missing HDMI supplies on SMDK5250
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: fix UART3 pins configuration in Exynos5250
Tudor Ambarus <[email protected]>
ARM: dts: at91: sama5d2: Fix PMERRLOC resource size
Tudor Ambarus <[email protected]>
ARM: dts: at91: sama7g5: Remove unused properties in i2c nodes
Johannes Berg <[email protected]>
rfkill: make new event layout opt-in
Michael Schmitz <[email protected]>
video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
Helge Deller <[email protected]>
video: fbdev: sm712fb: Fix crash in smtcfb_read()
Thomas Zimmermann <[email protected]>
fbdev: Hot-unplug firmware fb devices on forced removal
Cooper Chiou <[email protected]>
drm/edid: check basic audio support on CEA extension block
Tejun Heo <[email protected]>
block: don't merge across cgroup boundaries if blkcg is enabled
Shin'ichiro Kawasaki <[email protected]>
block: limit request dispatch loop duration
Tejun Heo <[email protected]>
block: fix rq-qos breakage from skipping rq_qos_done_bio()
Nikolay Borisov <[email protected]>
btrfs: zoned: put block group after final usage
Pekka Pessi <[email protected]>
mailbox: tegra-hsp: Flush whole channel
Christian Brauner <[email protected]>
landlock: Use square brackets around "landlock-ruleset"
Tom Rix <[email protected]>
samples/landlock: Fix path_list memory leak
Ojaswin Mujoo <[email protected]>
ext4: make mb_optimize_scan performance mount option work with extents
Ojaswin Mujoo <[email protected]>
ext4: make mb_optimize_scan option work with set/unset mount cmd
Ye Bin <[email protected]>
ext4: fix fs corruption when tring to remove a non-empty directory with IO error
Ritesh Harjani <[email protected]>
ext4: fix ext4_fc_stats trace point
Jann Horn <[email protected]>
coredump: Also dump first pages of non-executable ELF libraries
Sakari Ailus <[email protected]>
ACPI: properties: Consistently return -ENOENT if there are no more references
Rafael J. Wysocki <[email protected]>
Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag"
Sergey Shtylyov <[email protected]>
mmc: core: use sysfs_emit() instead of sprintf()
Ammar Faizi <[email protected]>
ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
Nishanth Menon <[email protected]>
arm64: dts: ti: k3-j721s2: Fix gic-v3 compatible regs
Nishanth Menon <[email protected]>
arm64: dts: ti: k3-am64: Fix gic-v3 compatible regs
Nishanth Menon <[email protected]>
arm64: dts: ti: k3-j7200: Fix gic-v3 compatible regs
Nishanth Menon <[email protected]>
arm64: dts: ti: k3-j721e: Fix gic-v3 compatible regs
Nishanth Menon <[email protected]>
arm64: dts: ti: k3-am65: Fix gic-v3 compatible regs
Manivannan Sadhasivam <[email protected]>
arm64: dts: qcom: sm8250: Fix MSI IRQ for PCIe1 and PCIe2
Vijay Balakrishna <[email protected]>
arm64: Do not defer reserve_crashkernel() for platforms with no DMA memory zones
David Engraf <[email protected]>
arm64: signal: nofpsimd: Do not allocate fp/simd context when not available
Ben Dooks <[email protected]>
PCI: fu740: Force 2.5GT/s for initial device probe
Oliver Hartkopp <[email protected]>
can: isotp: sanitize CAN ID checks in isotp_bind()
Lars Ellenberg <[email protected]>
drbd: fix potential silent data corruption
Steven Rostedt (Google) <[email protected]>
tracing: Have trace event string test handle zero length strings
Mikulas Patocka <[email protected]>
dm integrity: set journal entry unused when shrinking device
Mike Snitzer <[email protected]>
dm: fix double accounting of flush with data
Mike Snitzer <[email protected]>
dm: interlock pending dm_io and dm_wait_for_bios_completion
Kirill Tkhai <[email protected]>
dm: fix use-after-free in dm_cleanup_zoned_dev()
Mike Snitzer <[email protected]>
dm stats: fix too short end duration_ns when using precise_timestamps
Kuan-Ying Lee <[email protected]>
mm/kmemleak: reset tag when compare object pointer
Oscar Salvador <[email protected]>
mm: only re-generate demotion targets when a numa node changes its N_CPU state
Rik van Riel <[email protected]>
mm,hwpoison: unmap poisoned page before invalidation
Charan Teja Kalla <[email protected]>
Revert "mm: madvise: skip unmapped vma holes passed to process_madvise"
Charan Teja Kalla <[email protected]>
mm: madvise: return correct bytes advised with process_madvise
Charan Teja Kalla <[email protected]>
mm: madvise: skip unmapped vma holes passed to process_madvise
Hans de Goede <[email protected]>
drm/simpledrm: Add "panel orientation" property on non-upright mounted LCD panels
Joseph Qi <[email protected]>
ocfs2: fix crash when mount with quota enabled
Jens Axboe <[email protected]>
io_uring: ensure that fsnotify is always called
Ali Pouladi <[email protected]>
rtc: pl031: fix rtc features null pointer dereference
Mateusz Jończyk <[email protected]>
rtc: mc146818-lib: fix locking in mc146818_set_time
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Fix audio regression on Mi Notebook Pro 2020
Takashi Iwai <[email protected]>
ALSA: pcm: Fix potential AB/BA lock with buffer_mutex and mmap_lock
Mohan Kumar <[email protected]>
ALSA: hda: Avoid unsol event during RPM suspending
Xiaomeng Tong <[email protected]>
ALSA: cs4236: fix an incorrect NULL check on list iterator
Paulo Alcantara <[email protected]>
cifs: fix NULL ptr dereference in smb2_ioctl_query_info()
Paulo Alcantara <[email protected]>
cifs: prevent bad output lengths in smb2_ioctl_query_info()
Xiaomeng Tong <[email protected]>
cifs: fix incorrect use of list iterator after the loop
Paulo Alcantara <[email protected]>
cifs: do not skip link targets when an I/O fails
José Expósito <[email protected]>
Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads"
Atish Patra <[email protected]>
RISC-V: Declare per cpu boot data as static
Dmitry Vyukov <[email protected]>
riscv: Increase stack size under KASAN
Nikita Shubin <[email protected]>
riscv: Fix fill_callchain return value
Niklas Cassel <[email protected]>
riscv: dts: canaan: Fix SPI3 bus width
Manish Chopra <[email protected]>
qed: validate and restrict untrusted VFs vlan promisc mode
Manish Chopra <[email protected]>
qed: display VF trust config
Damien Le Moal <[email protected]>
scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands
James Smart <[email protected]>
scsi: scsi_transport_fc: Fix FPIN Link Integrity statistics counters
Adrian Hunter <[email protected]>
scsi: ufs: Fix runtime PM messages never-ending cycle
Adrian Hunter <[email protected]>
scsi: core: sd: Add silence_suspend flag to suppress some PM messages
Hugh Dickins <[email protected]>
mempolicy: mbind_range() set_policy() after vma_merge()
Rik van Riel <[email protected]>
mm: invalidate hwpoison page cache page in fault path
Alistair Popple <[email protected]>
mm/pages_alloc.c: don't create ZONE_MOVABLE beyond the end of a node
Peter Xu <[email protected]>
mm: don't skip swap entry even if zap_details specified
Minchan Kim <[email protected]>
mm: fs: fix lru_cache_disabled race in bh_lru
Baokun Li <[email protected]>
jffs2: fix memory leak in jffs2_scan_medium
Baokun Li <[email protected]>
jffs2: fix memory leak in jffs2_do_mount_fs
Baokun Li <[email protected]>
jffs2: fix use-after-free in jffs2_clear_xattr_subsystem
Hangyu Hua <[email protected]>
can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
Marc Kleine-Budde <[email protected]>
can: m_can: m_can_tx_handler(): fix use after free of skb
Hangyu Hua <[email protected]>
can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
Sean Nyekjaer <[email protected]>
mtd: rawnand: protect access to rawnand devices while in suspend
Tudor Ambarus <[email protected]>
mtd: spi-nor: Skip erase logic when SPI_NOR_NO_ERASE is set
Miquel Raynal <[email protected]>
spi: mxic: Fix the transmit path
Damien Le Moal <[email protected]>
net: bnxt_ptp: fix compilation error
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: drop pin banks references on error paths
Aidan MacDonald <[email protected]>
pinctrl: ingenic: Fix regmap on X series SoCs
Miaohe Lin <[email protected]>
mm/mlock: fix two bugs in user_shm_lock()
Alistair Delva <[email protected]>
remoteproc: Fix count check in rproc_coredump_write()
Chao Yu <[email protected]>
f2fs: fix to do sanity check on .cp_pack_total_block_count
Juhyung Park <[email protected]>
f2fs: quota: fix loop condition at f2fs_quota_sync()
Chao Yu <[email protected]>
f2fs: fix to unlock page correctly in error path of is_alive()
Dan Carpenter <[email protected]>
NFSD: prevent integer overflow on 32 bit systems
Dan Carpenter <[email protected]>
NFSD: prevent underflow in nfssvc_decode_writeargs()
Trond Myklebust <[email protected]>
NFS: NFSv2/v3 clients should never be setting NFS_CAP_XATTR
Trond Myklebust <[email protected]>
SUNRPC: Do not dereference non-socket transports in sysfs
NeilBrown <[email protected]>
SUNRPC: avoid race between mod_timer() and del_timer_sync()
Gwendal Grignou <[email protected]>
HID: intel-ish-hid: Use dma_alloc_coherent for firmware update
Johan Hovold <[email protected]>
firmware: sysfb: fix platform-device leak in error path
Ang Tien Sung <[email protected]>
firmware: stratix10-svc: add missing callback parameter on RSU
Bagas Sanjaya <[email protected]>
Documentation: update stable tree link
Bagas Sanjaya <[email protected]>
Documentation: add link to stable release candidate tree
Eric Biggers <[email protected]>
KEYS: asymmetric: properly validate hash_algo and encoding
Eric Biggers <[email protected]>
KEYS: asymmetric: enforce that sig algo matches key algo
Eric Biggers <[email protected]>
KEYS: fix length validation in keyctl_pkey_params_get_2()
Ronnie Sahlberg <[email protected]>
cifs: we do not need a spinlock around the tree access during umount
Ronnie Sahlberg <[email protected]>
cifs: fix handlecache and multiuser
Ronnie Sahlberg <[email protected]>
cifs: truncate the inode and mapping when we simulate fcollapse
Jann Horn <[email protected]>
ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
Kunihiko Hayashi <[email protected]>
clk: uniphier: Fix fixed-rate initialization
Quentin Schulz <[email protected]>
clk: rockchip: re-add rational best approximation algorithm to the fractional divider
Dan Carpenter <[email protected]>
greybus: svc: fix an error handling bug in gb_svc_hello()
Liam Beguin <[email protected]>
iio: inkern: make a best effort on offset calculation
Liam Beguin <[email protected]>
iio: inkern: apply consumer scale when no channel scale is available
Liam Beguin <[email protected]>
iio: inkern: apply consumer scale on IIO_VAL_INT cases
Robert Hancock <[email protected]>
iio: adc: xilinx-ams: Fixed wrong sequencer register settings
Robert Hancock <[email protected]>
iio: adc: xilinx-ams: Fixed missing PS channels
Liam Beguin <[email protected]>
iio: afe: rescale: use s64 for temporary scale calculations
Haibo Chen <[email protected]>
iio: imu: st_lsm6dsx: use dev_to_iio_dev() to get iio_dev struct
Billy Tsai <[email protected]>
iio: adc: aspeed: Add divider flag to fix incorrect voltage reading.
Haibo Chen <[email protected]>
iio: accel: mma8452: use the correct logic to get mma8452_data
Robert Hancock <[email protected]>
iio: adc: xilinx-ams: Fix single channel switching sequence
Robert Hancock <[email protected]>
dt-bindings: iio: adc: zynqmp_ams: Add clock entry
Miaoqian Lin <[email protected]>
coresight: syscfg: Fix memleak on registration failure in cscfg_create_device
James Clark <[email protected]>
coresight: Fix TRCCONFIGR.QE sysfs interface
Akira Yokosawa <[email protected]>
docs: sphinx/requirements: Limit jinja2<3.1
Paul Davey <[email protected]>
bus: mhi: Fix MHI DMA structure endianness
Paul Davey <[email protected]>
bus: mhi: Fix pm_state conversion to string
Yonglin Tan <[email protected]>
bus: mhi: pci_generic: Add mru_default for Quectel EM1xx series
Alexander Usyskin <[email protected]>
mei: avoid iterator usage outside of list_for_each_entry
Alexander Usyskin <[email protected]>
mei: me: add Alder Lake N device id.
Alexander Usyskin <[email protected]>
mei: me: disable driver on the ign firmware
Anssi Hannula <[email protected]>
xhci: fix uninitialized string returned by xhci_decode_ctrl_ctx()
Mathias Nyman <[email protected]>
xhci: make xhci_handshake timeout for xhci_reset() adjustable
Henry Lin <[email protected]>
xhci: fix runtime PM imbalance in USB2 resume
Anssi Hannula <[email protected]>
xhci: fix garbage USBSTS being logged in some cases
Alan Stern <[email protected]>
USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c
Sven Peter <[email protected]>
usb: typec: tipd: Forward plug orientation to typec subsystem
Jens Axboe <[email protected]>
block: ensure plug merging checks the correct queue at least once
Jens Axboe <[email protected]>
block: flush plug based on hardware and software queue order
Robin Murphy <[email protected]>
iommu/iova: Improve 32-bit free space estimate
Alex Deucher <[email protected]>
drm/amdgpu: only check for _PR3 on dGPUs
Alex Deucher <[email protected]>
drm/amdgpu: move PX checking into amdgpu_device_ip_early_init
Waiman Long <[email protected]>
locking/lockdep: Avoid potential access of invalid memory in lock_class
Muchun Song <[email protected]>
mm: kfence: fix missing objcg housekeeping for SLAB
Johan Hovold <[email protected]>
USB: serial: simple: add Nokia phone driver
Johan Hovold <[email protected]>
USB: serial: pl2303: fix GS type detection
Krzysztof Kozlowski <[email protected]>
dt-bindings: usb: hcd: correct usb-device path
Eddie James <[email protected]>
USB: serial: pl2303: add IBM device IDs
Linus Torvalds <[email protected]>
Revert "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""
-------------
Diffstat:
Documentation/ABI/testing/sysfs-fs-f2fs | 1 +
Documentation/admin-guide/kernel-parameters.txt | 3 +-
Documentation/admin-guide/sysctl/kernel.rst | 1 +
.../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 8 +
.../devicetree/bindings/media/i2c/hynix,hi846.yaml | 6 +-
.../memory-controllers/mediatek,smi-common.yaml | 28 +-
.../memory-controllers/mediatek,smi-larb.yaml | 16 +-
.../devicetree/bindings/mtd/nand-controller.yaml | 4 +-
.../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 2 +-
.../bindings/pinctrl/pinctrl-mt8195.yaml | 30 +-
.../bindings/spi/nvidia,tegra210-quad.yaml | 2 +-
Documentation/devicetree/bindings/spi/spi-mxic.txt | 4 +-
Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 +-
Documentation/driver-api/cxl/memory-devices.rst | 4 +-
Documentation/process/stable-kernel-rules.rst | 11 +-
Documentation/security/SCTP.rst | 26 +-
Documentation/sound/hd-audio/models.rst | 4 +
Documentation/sphinx/requirements.txt | 2 +
MAINTAINERS | 3 +-
Makefile | 4 +-
arch/Kconfig | 1 +
arch/arc/kernel/process.c | 2 +-
arch/arm/boot/dts/bcm2711.dtsi | 50 +++
arch/arm/boot/dts/bcm2837.dtsi | 49 +++
arch/arm/boot/dts/dra7-l4.dtsi | 5 +-
arch/arm/boot/dts/dra7.dtsi | 8 +-
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +-
arch/arm/boot/dts/exynos5250-smdk5250.dts | 3 +
arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 +
arch/arm/boot/dts/imx53-m53menlo.dts | 29 +-
arch/arm/boot/dts/imx7-colibri.dtsi | 4 +-
arch/arm/boot/dts/imx7-mba7.dtsi | 2 +-
arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +-
arch/arm/boot/dts/imx7d-pico-hobbit.dts | 4 +-
arch/arm/boot/dts/imx7d-pico-pi.dts | 4 +-
arch/arm/boot/dts/imx7d-sdb.dts | 4 +-
arch/arm/boot/dts/imx7s-warp.dts | 4 +-
arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 2 +-
arch/arm/boot/dts/openbmc-flash-layout.dtsi | 2 +-
arch/arm/boot/dts/qcom-ipq4019.dtsi | 3 +-
arch/arm/boot/dts/qcom-msm8960.dtsi | 8 +-
arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +-
arch/arm/boot/dts/sama5d2.dtsi | 2 +-
arch/arm/boot/dts/sama7g5.dtsi | 6 -
arch/arm/boot/dts/spear1340.dtsi | 6 +-
arch/arm/boot/dts/spear13xx.dtsi | 6 +-
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 2 +-
arch/arm/boot/dts/sun8i-v3s.dtsi | 22 +-
arch/arm/boot/dts/tegra20-asus-tf101.dts | 2 +
arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +-
.../boot/dts/tegra30-asus-transformer-common.dtsi | 2 +
arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 2 +
arch/arm/configs/multi_v5_defconfig | 2 +
arch/arm/crypto/Kconfig | 2 +
arch/arm/kernel/entry-ftrace.S | 53 +--
arch/arm/kernel/swp_emulate.c | 2 +-
arch/arm/kernel/traps.c | 2 +-
arch/arm/mach-iop32x/include/mach/entry-macro.S | 2 +-
arch/arm/mach-iop32x/include/mach/irqs.h | 2 +-
arch/arm/mach-iop32x/irq.c | 6 +-
arch/arm/mach-iop32x/irqs.h | 60 +--
arch/arm/mach-mmp/sram.c | 22 +-
arch/arm/mach-s3c/mach-jive.c | 6 +-
arch/arm64/Kconfig | 1 +
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 8 +-
.../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 8 +-
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +-
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +-
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +-
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8994.dtsi | 3 +
arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +-
arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +-
arch/arm64/boot/dts/qcom/sm8250.dtsi | 16 +-
arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm8450.dtsi | 28 +-
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 +-
arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 5 +-
arch/arm64/boot/dts/ti/k3-am64.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 5 +-
arch/arm64/boot/dts/ti/k3-am65.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 5 +-
arch/arm64/boot/dts/ti/k3-j7200.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 5 +-
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 5 +-
arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 4 +-
arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 +
arch/arm64/configs/defconfig | 2 +-
arch/arm64/include/asm/module.lds.h | 6 +-
arch/arm64/include/asm/spectre.h | 3 +-
arch/arm64/kernel/proton-pack.c | 9 +-
arch/arm64/kernel/signal.c | 10 +-
arch/arm64/mm/init.c | 36 +-
arch/arm64/mm/mmu.c | 41 +-
arch/arm64/net/bpf_jit_comp.c | 18 +-
arch/csky/kernel/perf_callchain.c | 2 +-
arch/csky/kernel/signal.c | 2 +-
arch/m68k/coldfire/device.c | 6 +-
arch/microblaze/include/asm/uaccess.h | 18 +-
arch/mips/Kconfig | 1 +
arch/mips/Makefile | 4 -
arch/mips/boot/compressed/Makefile | 1 +
arch/mips/crypto/crc32-mips.c | 46 +-
arch/mips/dec/int-handler.S | 6 +-
arch/mips/dec/prom/Makefile | 2 +-
arch/mips/dec/setup.c | 3 +-
arch/mips/include/asm/dec/prom.h | 15 +-
arch/mips/include/asm/pgalloc.h | 6 +
arch/mips/mm/tlbex.c | 23 +-
arch/mips/rb532/devices.c | 6 +-
arch/mips/vdso/Makefile | 3 +
arch/nios2/include/asm/uaccess.h | 26 +-
arch/nios2/kernel/signal.c | 20 +-
arch/parisc/include/asm/traps.h | 1 +
arch/parisc/kernel/cache.c | 28 +-
arch/parisc/kernel/traps.c | 2 +
arch/parisc/mm/fault.c | 89 ++++
arch/powerpc/Makefile | 2 +-
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 30 ++
arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 +-
arch/powerpc/include/asm/io.h | 40 +-
arch/powerpc/include/asm/set_memory.h | 12 +-
arch/powerpc/include/asm/uaccess.h | 3 +
arch/powerpc/kernel/time.c | 5 +-
arch/powerpc/kernel/tm.S | 25 +-
arch/powerpc/kvm/book3s_hv.c | 5 +-
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/lib/sstep.c | 12 +-
arch/powerpc/mm/fault.c | 14 +-
arch/powerpc/mm/kasan/kasan_init_32.c | 3 +-
arch/powerpc/mm/numa.c | 4 +-
arch/powerpc/mm/pageattr.c | 39 +-
arch/powerpc/mm/pgtable_32.c | 24 +-
arch/powerpc/perf/imc-pmu.c | 6 +-
arch/powerpc/platforms/8xx/pic.c | 1 +
arch/powerpc/platforms/powernv/rng.c | 6 +-
arch/powerpc/platforms/pseries/pci_dlpar.c | 4 +
arch/powerpc/sysdev/fsl_gtm.c | 4 +-
arch/powerpc/sysdev/xive/common.c | 6 +-
arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 +
arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 +
arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 +
arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 +
arch/riscv/include/asm/module.lds.h | 6 +-
arch/riscv/include/asm/thread_info.h | 10 +-
arch/riscv/kernel/cpu_ops_sbi.c | 2 +-
arch/riscv/kernel/perf_callchain.c | 6 +-
arch/s390/kvm/kvm-s390.c | 19 +-
arch/s390/kvm/kvm-s390.h | 4 +-
arch/s390/kvm/priv.c | 15 +-
arch/sparc/kernel/signal_32.c | 2 +-
arch/um/drivers/mconsole_kern.c | 3 +-
arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 38 +-
arch/x86/events/intel/pt.c | 2 +-
arch/x86/include/asm/svm.h | 10 +-
arch/x86/kernel/fpu/xstate.c | 2 +-
arch/x86/kernel/kvm.c | 2 +-
arch/x86/kvm/emulate.c | 14 +-
arch/x86/kvm/hyperv.c | 96 +++--
arch/x86/kvm/lapic.c | 9 +-
arch/x86/kvm/mmu.h | 1 +
arch/x86/kvm/mmu/paging_tmpl.h | 74 ++--
arch/x86/kvm/mmu/tdp_mmu.c | 61 ++-
arch/x86/kvm/mmu/tdp_mmu.h | 3 -
arch/x86/kvm/svm/avic.c | 17 +-
arch/x86/kvm/svm/sev.c | 36 +-
arch/x86/kvm/x86.c | 3 +-
arch/x86/lib/iomem.c | 65 ++-
arch/x86/xen/pmu.c | 10 +-
arch/x86/xen/pmu.h | 3 +-
arch/x86/xen/smp_pv.c | 2 +-
arch/xtensa/include/asm/pgtable.h | 4 +
arch/xtensa/include/asm/processor.h | 4 +-
arch/xtensa/kernel/jump_label.c | 2 +-
arch/xtensa/kernel/mxhead.S | 2 +
arch/xtensa/mm/tlb.c | 6 +
block/bfq-cgroup.c | 6 +
block/bfq-iosched.c | 31 +-
block/bfq-wf2q.c | 2 +-
block/bio.c | 3 +-
block/blk-cgroup.c | 10 +-
block/blk-ioc.c | 3 +-
block/blk-iolatency.c | 2 +-
block/blk-merge.c | 33 +-
block/blk-mq-sched.c | 9 +-
block/blk-mq.c | 59 ++-
block/blk-rq-qos.h | 20 +-
block/blk-sysfs.c | 8 +-
block/blk-throttle.c | 10 +-
block/blk-throttle.h | 2 -
block/genhd.c | 16 +-
crypto/Kconfig | 1 +
crypto/asymmetric_keys/pkcs7_verify.c | 6 -
crypto/asymmetric_keys/public_key.c | 126 ++++--
crypto/asymmetric_keys/x509_public_key.c | 6 -
crypto/authenc.c | 2 +-
crypto/rsa-pkcs1pad.c | 11 +-
crypto/xts.c | 1 +
drivers/acpi/acpica/nswalk.c | 3 +
drivers/acpi/apei/bert.c | 10 +-
drivers/acpi/apei/erst.c | 2 +-
drivers/acpi/apei/hest.c | 2 +-
drivers/acpi/bus.c | 27 +-
drivers/acpi/cppc_acpi.c | 5 +
drivers/acpi/property.c | 2 +-
drivers/acpi/x86/utils.c | 21 +
drivers/base/dd.c | 2 +-
drivers/base/memory.c | 8 +-
drivers/base/power/domain.c | 2 +-
drivers/base/power/main.c | 6 +-
drivers/block/drbd/drbd_req.c | 3 +-
drivers/block/loop.c | 11 +-
drivers/block/n64cart.c | 2 +-
drivers/bluetooth/btintel.c | 11 +-
drivers/bluetooth/btintel.h | 1 +
drivers/bluetooth/btmtksdio.c | 157 +++++--
drivers/bluetooth/btusb.c | 6 +
drivers/bluetooth/hci_h5.c | 8 +-
drivers/bluetooth/hci_serdev.c | 3 +-
drivers/bus/mhi/core/debugfs.c | 26 +-
drivers/bus/mhi/core/init.c | 46 +-
drivers/bus/mhi/core/internal.h | 121 +++---
drivers/bus/mhi/core/main.c | 22 +-
drivers/bus/mhi/core/pm.c | 4 +-
drivers/bus/mhi/pci_generic.c | 1 +
drivers/bus/mips_cdmm.c | 1 +
drivers/char/hw_random/Kconfig | 2 +-
drivers/char/hw_random/atmel-rng.c | 1 +
drivers/char/hw_random/cavium-rng-vf.c | 2 +-
drivers/char/hw_random/nomadik-rng.c | 4 +-
drivers/clk/actions/owl-s700.c | 1 +
drivers/clk/actions/owl-s900.c | 2 +-
drivers/clk/at91/sama7g5.c | 8 +-
drivers/clk/clk-clps711x.c | 2 +
drivers/clk/clk.c | 16 +-
drivers/clk/hisilicon/clk-hi3559a.c | 4 +-
drivers/clk/imx/clk-imx7d.c | 1 -
drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 +-
drivers/clk/loongson1/clk-loongson1c.c | 1 +
drivers/clk/qcom/clk-rcg2.c | 14 +-
drivers/clk/qcom/gcc-ipq8074.c | 21 +-
drivers/clk/qcom/gcc-msm8994.c | 1 +
drivers/clk/renesas/r8a779f0-cpg-mssr.c | 2 +-
drivers/clk/renesas/r9a07g044-cpg.c | 4 +-
drivers/clk/rockchip/clk.c | 3 +
drivers/clk/starfive/clk-starfive-jh7100.c | 82 +++-
drivers/clk/tegra/clk-tegra124-emc.c | 1 +
drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 1 +
drivers/clk/visconti/clkc-tmpv770x.c | 2 +-
drivers/clk/visconti/clkc.c | 2 +-
drivers/clk/visconti/clkc.h | 3 +
drivers/clocksource/acpi_pm.c | 6 +-
drivers/clocksource/exynos_mct.c | 10 +-
drivers/clocksource/timer-microchip-pit64b.c | 2 +-
drivers/clocksource/timer-of.c | 6 +-
drivers/clocksource/timer-ti-dm-systimer.c | 4 +-
drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +-
drivers/cpuidle/cpuidle-qcom-spm.c | 20 +
.../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 3 +
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 3 +
.../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 3 +
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 +
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 3 +
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +
drivers/crypto/ccp/ccp-dmaengine.c | 16 +
drivers/crypto/ccp/sev-dev.c | 2 +-
drivers/crypto/ccree/cc_buffer_mgr.c | 7 +
drivers/crypto/ccree/cc_cipher.c | 2 +-
drivers/crypto/gemini/sl3516-ce-cipher.c | 2 +
drivers/crypto/hisilicon/qm.c | 2 +-
drivers/crypto/hisilicon/sec2/sec_crypto.c | 16 +-
drivers/crypto/hisilicon/sec2/sec_main.c | 8 +-
drivers/crypto/marvell/Kconfig | 1 +
.../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 43 +-
drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 17 +-
drivers/crypto/mxs-dcp.c | 2 +-
drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 2 +-
drivers/crypto/qat/qat_common/adf_gen4_pfvf.c | 42 +-
drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c | 4 +-
drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 1 -
drivers/crypto/vmx/Kconfig | 4 +
drivers/cxl/core/Makefile | 2 +-
drivers/cxl/core/{bus.c => port.c} | 4 +
drivers/cxl/core/regs.c | 6 +-
drivers/dax/super.c | 1 +
drivers/dma-buf/udmabuf.c | 4 +
drivers/dma/hisi_dma.c | 2 +-
drivers/dma/idxd/device.c | 9 +-
drivers/firmware/efi/efi-pstore.c | 2 +-
drivers/firmware/google/Kconfig | 2 +-
drivers/firmware/qcom_scm.c | 6 -
drivers/firmware/stratix10-svc.c | 2 +-
drivers/firmware/sysfb_simplefb.c | 23 +-
drivers/fsi/fsi-master-aspeed.c | 17 +-
drivers/fsi/fsi-scom.c | 45 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +
drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 13 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 -
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 +-
.../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 8 +
drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 5 +
.../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 14 -
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 +
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 29 +-
drivers/gpu/drm/bridge/analogix/anx7625.c | 3 +-
drivers/gpu/drm/bridge/cdns-dsi.c | 1 +
drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +-
drivers/gpu/drm/bridge/nwl-dsi.c | 1 +
drivers/gpu/drm/bridge/sil-sii8620.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 5 +-
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 1 +
drivers/gpu/drm/bridge/ti-sn65dsi83.c | 32 +-
drivers/gpu/drm/drm_dp_helper.c | 10 -
drivers/gpu/drm/drm_edid.c | 18 +-
drivers/gpu/drm/drm_fb_helper.c | 9 +-
drivers/gpu/drm/drm_syncobj.c | 61 ++-
drivers/gpu/drm/i915/display/intel_bw.c | 3 +-
drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +-
drivers/gpu/drm/i915/display/intel_opregion.c | 15 +
drivers/gpu/drm/i915/display/intel_pps.c | 6 +-
drivers/gpu/drm/i915/display/intel_pps.h | 2 +-
drivers/gpu/drm/i915/display/intel_psr.c | 4 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 10 +-
drivers/gpu/drm/meson/meson_drv.c | 25 +-
drivers/gpu/drm/meson/meson_osd_afbcd.c | 41 +-
drivers/gpu/drm/meson/meson_osd_afbcd.h | 1 +
drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +-
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 12 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 8 +
drivers/gpu/drm/msm/dp/dp_ctrl.c | 83 ++--
drivers/gpu/drm/msm/dp/dp_ctrl.h | 8 +-
drivers/gpu/drm/msm/dp/dp_display.c | 116 +++---
drivers/gpu/drm/msm/dp/dp_drm.c | 21 +-
drivers/gpu/drm/msm/dp/dp_panel.c | 5 +
drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 4 +-
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 4 +-
drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 4 +-
drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 +-
drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 26 +-
drivers/gpu/drm/nouveau/nouveau_backlight.c | 6 +-
drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 9 +-
drivers/gpu/drm/panfrost/panfrost_gpu.c | 5 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 2 +-
drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 4 +-
drivers/gpu/drm/tegra/dp.c | 11 +-
drivers/gpu/drm/tegra/dsi.c | 4 +-
drivers/gpu/drm/tiny/simpledrm.c | 3 +
drivers/gpu/drm/v3d/v3d_drv.c | 8 +-
drivers/gpu/host1x/dev.c | 8 +-
drivers/greybus/svc.c | 8 +-
drivers/hid/i2c-hid/i2c-hid-core.c | 32 +-
drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 29 +-
drivers/hv/hv_balloon.c | 2 +-
drivers/hwmon/pmbus/pmbus.h | 1 +
drivers/hwmon/pmbus/pmbus_core.c | 18 +-
drivers/hwmon/sch56xx-common.c | 2 +-
.../hwtracing/coresight/coresight-etm4x-sysfs.c | 8 +-
drivers/hwtracing/coresight/coresight-syscfg.c | 2 +-
drivers/i2c/busses/i2c-bcm2835.c | 21 +-
drivers/i2c/busses/i2c-meson.c | 12 +-
drivers/i2c/busses/i2c-pasemi-core.c | 1 -
drivers/i2c/busses/i2c-pasemi-pci.c | 1 +
drivers/i2c/busses/i2c-xiic.c | 3 +-
drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +-
drivers/iio/accel/mma8452.c | 33 +-
drivers/iio/adc/aspeed_adc.c | 4 +-
drivers/iio/adc/twl6030-gpadc.c | 2 +
drivers/iio/adc/xilinx-ams.c | 15 +-
drivers/iio/afe/iio-rescale.c | 8 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 4 +-
drivers/iio/inkern.c | 40 +-
drivers/infiniband/core/cma.c | 2 +-
drivers/infiniband/core/nldev.c | 3 +-
drivers/infiniband/core/verbs.c | 1 +
drivers/infiniband/hw/hfi1/verbs.c | 3 +-
drivers/infiniband/hw/irdma/ctrl.c | 10 +-
drivers/infiniband/hw/irdma/hw.c | 2 +-
drivers/infiniband/hw/irdma/i40iw_if.c | 1 +
drivers/infiniband/hw/irdma/main.c | 1 +
drivers/infiniband/hw/irdma/main.h | 1 +
drivers/infiniband/hw/irdma/utils.c | 48 ++-
drivers/infiniband/hw/irdma/verbs.c | 4 +-
drivers/infiniband/hw/mlx5/devx.c | 4 +-
drivers/infiniband/hw/mlx5/mr.c | 2 +
drivers/infiniband/sw/rxe/rxe_av.c | 19 +-
drivers/infiniband/sw/rxe/rxe_loc.h | 5 +-
drivers/infiniband/sw/rxe/rxe_net.c | 17 +-
drivers/infiniband/sw/rxe/rxe_req.c | 63 +--
drivers/infiniband/sw/rxe/rxe_resp.c | 12 +-
drivers/input/input.c | 6 -
drivers/iommu/iova.c | 5 +-
drivers/iommu/ipmmu-vmsa.c | 4 +-
drivers/iommu/mtk_iommu.c | 32 +-
drivers/iommu/mtk_iommu_v1.c | 40 +-
drivers/irqchip/irq-nvic.c | 2 +
drivers/irqchip/qcom-pdc.c | 5 +-
drivers/mailbox/imx-mailbox.c | 11 +-
drivers/mailbox/tegra-hsp.c | 5 +
drivers/md/bcache/btree.c | 6 +-
drivers/md/bcache/writeback.c | 6 +-
drivers/md/dm-core.h | 2 +
drivers/md/dm-crypt.c | 2 +-
drivers/md/dm-integrity.c | 6 +-
drivers/md/dm-stats.c | 34 +-
drivers/md/dm-stats.h | 11 +-
drivers/md/dm.c | 86 ++--
drivers/media/i2c/adv7511-v4l2.c | 2 +-
drivers/media/i2c/adv7604.c | 2 +-
drivers/media/i2c/adv7842.c | 2 +-
drivers/media/i2c/ov2740.c | 8 +-
drivers/media/i2c/ov5640.c | 14 +-
drivers/media/i2c/ov5648.c | 12 +-
drivers/media/i2c/ov6650.c | 115 +++--
drivers/media/i2c/ov8865.c | 4 +-
drivers/media/pci/bt8xx/bttv-driver.c | 4 +-
drivers/media/pci/cx88/cx88-mpeg.c | 3 +
drivers/media/pci/ivtv/ivtv-driver.h | 1 -
drivers/media/pci/ivtv/ivtv-ioctl.c | 10 +-
drivers/media/pci/ivtv/ivtv-streams.c | 11 +-
drivers/media/pci/saa7134/saa7134-alsa.c | 4 +-
drivers/media/platform/aspeed-video.c | 9 +-
drivers/media/platform/atmel/atmel-isc-base.c | 22 +-
drivers/media/platform/atmel/atmel-sama7g5-isc.c | 6 -
drivers/media/platform/coda/coda-common.c | 1 +
drivers/media/platform/davinci/vpif.c | 109 +++--
drivers/media/platform/imx-jpeg/mxc-jpeg.c | 7 +-
drivers/media/platform/meson/ge2d/ge2d.c | 24 +-
.../media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 2 +
drivers/media/platform/omap3isp/ispstat.c | 5 +-
drivers/media/platform/qcom/camss/camss-csid-170.c | 19 +-
drivers/media/platform/qcom/camss/camss-vfe-170.c | 12 +-
drivers/media/platform/qcom/venus/helpers.c | 2 +-
drivers/media/platform/qcom/venus/hfi_cmds.c | 2 +
drivers/media/platform/qcom/venus/venc.c | 4 +-
drivers/media/platform/qcom/venus/venc_ctrls.c | 6 +-
drivers/media/platform/ti-vpe/cal-video.c | 3 +
drivers/media/rc/gpio-ir-tx.c | 28 +-
drivers/media/rc/ir_toy.c | 2 +-
drivers/media/test-drivers/vidtv/vidtv_s302m.c | 17 +-
drivers/media/usb/em28xx/em28xx-cards.c | 13 +-
drivers/media/usb/go7007/s2250-board.c | 10 +-
drivers/media/usb/hdpvr/hdpvr-video.c | 4 +-
drivers/media/usb/stk1160/stk1160-core.c | 2 +-
drivers/media/usb/stk1160/stk1160-v4l.c | 10 +-
drivers/media/usb/stk1160/stk1160.h | 2 +-
drivers/media/v4l2-core/v4l2-ctrls-core.c | 18 +
drivers/media/v4l2-core/v4l2-ioctl.c | 12 +-
drivers/media/v4l2-core/v4l2-mem2mem.c | 53 ++-
drivers/memory/emif.c | 8 +-
drivers/memory/tegra/tegra20-emc.c | 2 +-
drivers/memstick/core/mspro_block.c | 10 +-
drivers/mfd/asic3.c | 10 +-
drivers/mfd/mc13xxx-core.c | 4 +-
drivers/misc/cardreader/alcor_pci.c | 9 +-
drivers/misc/habanalabs/common/debugfs.c | 2 +
drivers/misc/kgdbts.c | 4 +-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/hw-me.c | 23 +-
drivers/misc/mei/interrupt.c | 35 +-
drivers/misc/mei/pci-me.c | 1 +
drivers/mmc/core/bus.c | 9 +-
drivers/mmc/core/bus.h | 3 +-
drivers/mmc/core/host.c | 15 +-
drivers/mmc/core/mmc.c | 16 +-
drivers/mmc/core/sd.c | 25 +-
drivers/mmc/core/sdio.c | 5 +-
drivers/mmc/core/sdio_bus.c | 7 +-
drivers/mmc/host/davinci_mmc.c | 6 +-
drivers/mmc/host/rtsx_pci_sdmmc.c | 20 +-
drivers/mmc/host/sdhci_am654.c | 24 +-
drivers/mtd/devices/mchp23k256.c | 14 +
drivers/mtd/devices/mchp48l640.c | 10 +
drivers/mtd/nand/onenand/generic.c | 7 +-
drivers/mtd/nand/raw/atmel/nand-controller.c | 14 +-
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 +
drivers/mtd/nand/raw/nand_base.c | 44 +-
drivers/mtd/nand/raw/pl35x-nand-controller.c | 2 +-
drivers/mtd/spi-nor/core.c | 3 +-
drivers/mtd/ubi/build.c | 9 +-
drivers/mtd/ubi/fastmap.c | 28 +-
drivers/mtd/ubi/vmt.c | 8 +-
drivers/net/bareudp.c | 19 +-
drivers/net/can/m_can/m_can.c | 5 +-
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +-
drivers/net/can/usb/ems_usb.c | 1 -
drivers/net/can/usb/mcba_usb.c | 27 +-
drivers/net/can/usb/usb_8dev.c | 30 +-
drivers/net/can/vxcan.c | 2 +-
drivers/net/dsa/Kconfig | 12 +-
drivers/net/dsa/Makefile | 3 +-
drivers/net/dsa/bcm_sf2_cfp.c | 6 +-
drivers/net/dsa/mv88e6xxx/chip.c | 1 +
drivers/net/dsa/realtek/Kconfig | 20 +
drivers/net/dsa/realtek/Makefile | 3 +
drivers/net/dsa/{ => realtek}/realtek-smi-core.c | 0
drivers/net/dsa/{ => realtek}/realtek-smi-core.h | 4 +-
drivers/net/dsa/{ => realtek}/rtl8365mb.c | 0
drivers/net/dsa/{ => realtek}/rtl8366.c | 0
drivers/net/dsa/{ => realtek}/rtl8366rb.c | 2 +
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 6 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 2 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +-
.../net/ethernet/freescale/enetc/enetc_ethtool.c | 5 +-
drivers/net/ethernet/freescale/enetc/enetc_qos.c | 128 +++---
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 +
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 15 +-
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 1 -
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 44 +-
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 23 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 179 ++++++--
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 4 +
.../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +
drivers/net/ethernet/ibm/ibmvnic.c | 63 ++-
drivers/net/ethernet/ibm/ibmvnic.h | 7 +-
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 19 +-
drivers/net/ethernet/intel/ice/ice.h | 4 +-
drivers/net/ethernet/intel/ice/ice_idc.c | 3 +
drivers/net/ethernet/intel/ice/ice_main.c | 25 +-
drivers/net/ethernet/intel/ice/ice_xsk.c | 16 +-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 -
drivers/net/ethernet/intel/igb/igb_main.c | 19 +-
drivers/net/ethernet/intel/igc/igc_main.c | 16 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 27 +-
.../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 15 +-
drivers/net/ethernet/microchip/sparx5/Kconfig | 2 +
.../net/ethernet/microchip/sparx5/sparx5_fdma.c | 2 +
.../net/ethernet/pensando/ionic/ionic_bus_pci.c | 4 +-
drivers/net/ethernet/pensando/ionic/ionic_dev.c | 20 +-
drivers/net/ethernet/pensando/ionic/ionic_dev.h | 1 +
drivers/net/ethernet/pensando/ionic/ionic_main.c | 34 +-
drivers/net/ethernet/qlogic/qed/qed_sriov.c | 29 +-
drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 +
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +-
.../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 7 +
drivers/net/ethernet/ti/cpsw_ethtool.c | 6 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 72 ++--
drivers/net/hyperv/netvsc.c | 24 +-
drivers/net/phy/at803x.c | 40 +-
drivers/net/phy/broadcom.c | 21 +
drivers/net/phy/micrel.c | 30 +-
drivers/net/usb/asix.h | 4 +-
drivers/net/usb/asix_common.c | 19 +-
drivers/net/usb/asix_devices.c | 21 +-
drivers/net/wireguard/queueing.c | 3 +-
drivers/net/wireguard/socket.c | 5 +-
drivers/net/wireless/ath/ath10k/snoc.c | 2 +-
drivers/net/wireless/ath/ath10k/wow.c | 7 +-
drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +-
drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +-
drivers/net/wireless/ath/ath11k/mac.c | 34 +-
drivers/net/wireless/ath/ath11k/mhi.c | 1 +
drivers/net/wireless/ath/ath11k/qmi.c | 3 +-
drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +
drivers/net/wireless/ath/carl9170/main.c | 2 +-
.../broadcom/brcm80211/brcmfmac/firmware.c | 2 +
.../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 73 ++--
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 -
drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +-
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 -
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 13 +-
drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 2 -
drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 4 +
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +-
drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 +-
drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 5 +-
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt76.h | 2 +-
drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 +
drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 56 ++-
drivers/net/wireless/mediatek/mt76/mt7615/main.c | 3 +
.../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +-
.../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 3 +-
drivers/net/wireless/mediatek/mt76/mt7915/init.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 50 ++-
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 67 ++-
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 8 +-
.../net/wireless/mediatek/mt76/mt7921/debugfs.c | 16 +-
drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 119 ------
drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 68 +--
drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 3 +
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 57 +--
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 1 +
drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 124 ++++++
.../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 18 +-
drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 11 +-
.../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 38 ++
drivers/net/wireless/mediatek/mt76/sdio.h | 2 +
drivers/net/wireless/ray_cs.c | 6 +
drivers/net/wireless/realtek/rtw88/fw.c | 42 +-
drivers/net/wireless/realtek/rtw88/mac80211.c | 5 +-
drivers/net/wireless/realtek/rtw88/main.c | 16 +-
drivers/net/wireless/realtek/rtw88/main.h | 4 +-
drivers/net/wwan/qcom_bam_dmux.c | 2 +-
drivers/nvdimm/region_devs.c | 3 +
drivers/nvme/host/core.c | 48 ++-
drivers/nvme/host/multipath.c | 7 +-
drivers/nvme/host/nvme.h | 19 +
drivers/nvme/host/tcp.c | 40 ++
drivers/pci/access.c | 9 +-
drivers/pci/controller/dwc/pci-imx6.c | 15 +-
drivers/pci/controller/dwc/pcie-fu740.c | 51 ++-
drivers/pci/controller/pci-aardvark.c | 13 +-
drivers/pci/controller/pci-xgene.c | 35 +-
drivers/pci/hotplug/pciehp_hpc.c | 2 +
drivers/pci/quirks.c | 12 +
drivers/perf/Kconfig | 2 +-
drivers/perf/arm-cmn.c | 21 +-
drivers/phy/broadcom/phy-brcm-usb-init.c | 36 ++
drivers/phy/broadcom/phy-brcm-usb-init.h | 1 +
drivers/phy/broadcom/phy-brcm-usb.c | 11 +-
drivers/phy/phy-core-mipi-dphy.c | 4 +-
drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 +
drivers/pinctrl/mediatek/pinctrl-paris.c | 32 +-
drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +-
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 185 ++++-----
drivers/pinctrl/pinconf-generic.c | 6 +-
drivers/pinctrl/pinctrl-ingenic.c | 46 +-
drivers/pinctrl/pinctrl-microchip-sgpio.c | 15 +
drivers/pinctrl/pinctrl-ocelot.c | 7 +-
drivers/pinctrl/pinctrl-rockchip.c | 2 +
drivers/pinctrl/renesas/core.c | 5 +-
drivers/pinctrl/renesas/pfc-r8a77470.c | 4 +-
drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 -
drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +-
drivers/platform/chrome/Makefile | 3 +-
drivers/platform/chrome/cros_ec_sensorhub_ring.c | 3 +-
drivers/platform/chrome/cros_ec_sensorhub_trace.h | 123 ++++++
drivers/platform/chrome/cros_ec_trace.h | 95 -----
drivers/platform/chrome/cros_ec_typec.c | 6 +
drivers/platform/x86/asus-wmi.c | 2 +-
drivers/platform/x86/huawei-wmi.c | 13 +-
drivers/power/reset/gemini-poweroff.c | 4 +-
drivers/power/supply/ab8500_bmdata.c | 8 +-
drivers/power/supply/ab8500_chargalg.c | 6 +-
drivers/power/supply/ab8500_fg.c | 12 +-
drivers/power/supply/bq24190_charger.c | 7 +-
drivers/power/supply/sbs-charger.c | 18 +-
drivers/power/supply/wm8350_power.c | 97 ++++-
drivers/powercap/dtpm_cpu.c | 7 +
drivers/pps/clients/pps-gpio.c | 2 +-
drivers/ptp/ptp_clock.c | 11 +-
drivers/pwm/pwm-lpc18xx-sct.c | 20 +-
drivers/regulator/qcom_smd-regulator.c | 4 +-
drivers/regulator/rpi-panel-attiny-regulator.c | 56 ++-
drivers/remoteproc/qcom_q6v5_adsp.c | 1 +
drivers/remoteproc/qcom_q6v5_mss.c | 11 +-
drivers/remoteproc/qcom_wcnss.c | 1 +
drivers/remoteproc/remoteproc_debugfs.c | 2 +-
drivers/rtc/interface.c | 7 +-
drivers/rtc/rtc-gamecube.c | 1 +
drivers/rtc/rtc-mc146818-lib.c | 6 +-
drivers/rtc/rtc-pl031.c | 6 +-
drivers/scsi/fnic/fnic_scsi.c | 2 +-
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +-
drivers/scsi/libsas/sas_ata.c | 2 +-
drivers/scsi/mpt3sas/mpt3sas_base.c | 25 +-
drivers/scsi/pm8001/pm8001_hwi.c | 23 +-
drivers/scsi/pm8001/pm80xx_hwi.c | 209 +++++-----
drivers/scsi/qla2xxx/qla_attr.c | 7 +-
drivers/scsi/qla2xxx/qla_bsg.c | 6 +-
drivers/scsi/qla2xxx/qla_def.h | 22 +-
drivers/scsi/qla2xxx/qla_edif.c | 25 +-
drivers/scsi/qla2xxx/qla_gbl.h | 4 +-
drivers/scsi/qla2xxx/qla_gs.c | 160 +++----
drivers/scsi/qla2xxx/qla_init.c | 233 ++++++-----
drivers/scsi/qla2xxx/qla_inline.h | 2 +
drivers/scsi/qla2xxx/qla_iocb.c | 93 +++--
drivers/scsi/qla2xxx/qla_isr.c | 1 +
drivers/scsi/qla2xxx/qla_mbx.c | 29 +-
drivers/scsi/qla2xxx/qla_mid.c | 9 +-
drivers/scsi/qla2xxx/qla_mr.c | 11 +-
drivers/scsi/qla2xxx/qla_nvme.c | 22 +
drivers/scsi/qla2xxx/qla_os.c | 54 ++-
drivers/scsi/qla2xxx/qla_sup.c | 4 +-
drivers/scsi/qla2xxx/qla_target.c | 14 +-
drivers/scsi/qla2xxx/qla_tmpl.c | 9 +-
drivers/scsi/scsi_error.c | 9 +-
drivers/scsi/scsi_transport_fc.c | 39 +-
drivers/scsi/sd.c | 6 +-
drivers/scsi/ufs/ufshcd.c | 21 +-
drivers/soc/mediatek/mtk-pm-domains.c | 3 +
drivers/soc/qcom/ocmem.c | 1 +
drivers/soc/qcom/qcom_aoss.c | 8 +-
drivers/soc/qcom/rpmpd.c | 3 +
drivers/soc/ti/wkup_m3_ipc.c | 4 +-
drivers/soundwire/dmi-quirks.c | 2 +-
drivers/soundwire/intel.c | 4 +-
drivers/spi/spi-fsi.c | 10 +
drivers/spi/spi-mt65xx.c | 15 +-
drivers/spi/spi-mxic.c | 28 +-
drivers/spi/spi-pxa2xx-pci.c | 17 +-
drivers/spi/spi-tegra114.c | 4 +
drivers/spi/spi-tegra20-slink.c | 8 +-
drivers/spi/spi-tegra210-quad.c | 2 +
drivers/spi/spi-zynqmp-gqspi.c | 5 +-
drivers/staging/iio/adc/ad7280a.c | 4 +-
drivers/staging/media/atomisp/pci/atomisp_acc.c | 28 +-
.../media/atomisp/pci/atomisp_gmin_platform.c | 18 +
drivers/staging/media/atomisp/pci/hmm/hmm.c | 7 +-
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 2 +-
drivers/staging/media/hantro/hantro_h1_regs.h | 2 +-
drivers/staging/media/hantro/sunxi_vpu_hw.c | 4 +-
drivers/staging/media/imx/imx7-mipi-csis.c | 6 +-
drivers/staging/media/imx/imx8mq-mipi-csi2.c | 74 ++--
drivers/staging/media/meson/vdec/esparser.c | 7 +-
drivers/staging/media/meson/vdec/vdec_helpers.c | 8 +-
drivers/staging/media/meson/vdec/vdec_helpers.h | 4 +-
drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 2 +-
drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +-
drivers/staging/media/zoran/zoran.h | 2 +-
drivers/staging/media/zoran/zoran_card.c | 86 ++--
drivers/staging/media/zoran/zoran_device.c | 7 +-
drivers/staging/media/zoran/zoran_driver.c | 18 +-
drivers/staging/mt7621-dts/gbpc1.dts | 40 +-
drivers/staging/mt7621-dts/gbpc2.dts | 116 +++++-
drivers/staging/mt7621-dts/mt7621.dtsi | 26 +-
drivers/staging/qlge/qlge_main.c | 11 +-
drivers/staging/r8188eu/core/rtw_recv.c | 3 +-
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 +-
.../intel/int340x_thermal/int3400_thermal.c | 7 +-
drivers/tty/hvc/hvc_iucv.c | 4 +-
drivers/tty/mxser.c | 15 +-
drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 +-
drivers/tty/serial/8250/8250_dma.c | 11 +-
drivers/tty/serial/8250/8250_lpss.c | 28 +-
drivers/tty/serial/8250/8250_mid.c | 19 +-
drivers/tty/serial/8250/8250_port.c | 24 +-
drivers/tty/serial/kgdboc.c | 6 +-
drivers/tty/serial/serial_core.c | 14 +
drivers/usb/host/xhci-hub.c | 5 +-
drivers/usb/host/xhci-mem.c | 2 +-
drivers/usb/host/xhci.c | 20 +-
drivers/usb/host/xhci.h | 14 +-
drivers/usb/serial/Kconfig | 1 +
drivers/usb/serial/pl2303.c | 2 +
drivers/usb/serial/pl2303.h | 3 +
drivers/usb/serial/usb-serial-simple.c | 7 +
drivers/usb/storage/ene_ub6250.c | 155 ++++---
drivers/usb/storage/realtek_cr.c | 2 +-
drivers/usb/typec/tipd/core.c | 5 +
drivers/usb/typec/tipd/tps6598x.h | 1 +
drivers/vdpa/mlx5/net/mlx5_vnet.c | 7 +-
drivers/vfio/pci/vfio_pci_core.c | 61 +++
drivers/vhost/iotlb.c | 6 +-
drivers/video/fbdev/atafb.c | 12 +-
drivers/video/fbdev/atmel_lcdfb.c | 11 +-
drivers/video/fbdev/cirrusfb.c | 16 +-
drivers/video/fbdev/controlfb.c | 2 +
drivers/video/fbdev/core/fbcvt.c | 53 +--
drivers/video/fbdev/core/fbmem.c | 29 +-
drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
drivers/video/fbdev/nvidia/nv_i2c.c | 2 +-
.../fbdev/omap2/omapfb/displays/connector-dvi.c | 1 +
.../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 +-
.../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +-
.../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +-
drivers/video/fbdev/sm712fb.c | 46 +-
drivers/video/fbdev/smscufx.c | 3 +-
drivers/video/fbdev/udlfb.c | 8 +-
drivers/video/fbdev/w100fb.c | 15 +-
drivers/virt/acrn/hsm.c | 20 +-
drivers/virt/acrn/mm.c | 24 ++
drivers/virtio/virtio.c | 5 +-
drivers/virtio/virtio_pci_common.c | 48 +--
drivers/virtio/virtio_pci_common.h | 7 +-
drivers/virtio/virtio_pci_legacy.c | 5 +-
drivers/virtio/virtio_pci_modern.c | 6 +-
drivers/watchdog/rti_wdt.c | 1 +
fs/binfmt_elf.c | 90 ++--
fs/binfmt_elf_fdpic.c | 18 +-
fs/btrfs/block-group.c | 8 +-
fs/btrfs/compression.c | 20 +-
fs/btrfs/disk-io.c | 26 +-
fs/btrfs/extent_io.c | 22 +-
fs/btrfs/file-item.c | 38 +-
fs/btrfs/inode.c | 8 +-
fs/btrfs/reflink.c | 7 +-
fs/btrfs/space-info.c | 3 +-
fs/btrfs/volumes.c | 48 ++-
fs/buffer.c | 8 +-
fs/cifs/cifs_swn.c | 6 +-
fs/cifs/cifsfs.c | 14 +-
fs/cifs/cifsproto.h | 3 +
fs/cifs/connect.c | 56 ++-
fs/cifs/dfs_cache.c | 2 +-
fs/cifs/file.c | 10 +
fs/cifs/smb1ops.c | 2 +-
fs/cifs/smb2ops.c | 148 ++++---
fs/cifs/smb2pdu.c | 6 +-
fs/cifs/transport.c | 2 +-
fs/coredump.c | 86 +++-
fs/erofs/sysfs.c | 8 +-
fs/exec.c | 26 +-
fs/ext2/super.c | 6 +-
fs/ext4/inline.c | 9 +-
fs/ext4/inode.c | 25 ++
fs/ext4/mballoc.c | 128 +++---
fs/ext4/namei.c | 10 +-
fs/ext4/super.c | 53 ++-
fs/f2fs/checkpoint.c | 8 +-
fs/f2fs/compress.c | 5 +-
fs/f2fs/data.c | 8 +-
fs/f2fs/debug.c | 18 +-
fs/f2fs/f2fs.h | 1 +
fs/f2fs/file.c | 5 +-
fs/f2fs/gc.c | 4 +-
fs/f2fs/inode.c | 7 +-
fs/f2fs/node.c | 6 +-
fs/f2fs/segment.c | 7 +
fs/f2fs/super.c | 10 +-
fs/f2fs/sysfs.c | 2 +-
fs/file.c | 31 +-
fs/gfs2/bmap.c | 2 +-
fs/gfs2/file.c | 3 +-
fs/gfs2/inode.c | 2 +-
fs/gfs2/rgrp.c | 10 +-
fs/gfs2/rgrp.h | 2 +-
fs/gfs2/super.c | 2 +-
fs/io_uring.c | 21 +-
fs/iomap/buffered-io.c | 3 +-
fs/jffs2/build.c | 4 +-
fs/jffs2/fs.c | 2 +-
fs/jffs2/scan.c | 6 +-
fs/jfs/jfs_dmap.c | 7 +
fs/nfs/callback_proc.c | 27 +-
fs/nfs/callback_xdr.c | 4 -
fs/nfs/nfs2xdr.c | 2 +-
fs/nfs/nfs3xdr.c | 22 +-
fs/nfs/nfs4proc.c | 1 +
fs/nfs/pagelist.c | 1 +
fs/nfs/pnfs.c | 11 +
fs/nfs/pnfs.h | 2 +
fs/nfs/proc.c | 1 +
fs/nfs/write.c | 7 +-
fs/nfsd/filecache.c | 6 +-
fs/nfsd/nfs4state.c | 12 +-
fs/nfsd/nfsproc.c | 2 +-
fs/nfsd/xdr.h | 2 +-
fs/ntfs/inode.c | 4 +
fs/ocfs2/quota_global.c | 23 +-
fs/ocfs2/quota_local.c | 2 -
fs/proc/bootconfig.c | 2 +
fs/pstore/platform.c | 38 +-
fs/ubifs/dir.c | 238 ++++++-----
fs/ubifs/file.c | 14 +-
fs/ubifs/io.c | 34 +-
fs/ubifs/ioctl.c | 2 +-
fs/ubifs/journal.c | 52 ++-
include/drm/drm_connector.h | 12 +-
include/drm/drm_dp_helper.h | 4 +-
include/drm/drm_modeset_lock.h | 1 +
include/linux/atomic/atomic-arch-fallback.h | 38 +-
include/linux/binfmts.h | 3 +
include/linux/blk-cgroup.h | 17 +
include/linux/blk_types.h | 3 +-
include/linux/coredump.h | 5 +-
include/linux/fb.h | 1 +
include/linux/lsm_hook_defs.h | 2 +
include/linux/lsm_hooks.h | 5 +
include/linux/migrate.h | 8 +
include/linux/mtd/rawnand.h | 2 +
include/linux/netfilter_netdev.h | 2 +-
include/linux/nvme.h | 1 +
include/linux/pci.h | 1 +
include/linux/pstore.h | 6 +-
include/linux/randomize_kstack.h | 16 +-
include/linux/sched.h | 19 +-
include/linux/security.h | 8 +
include/linux/serial_core.h | 2 +
include/linux/skbuff.h | 28 +-
include/linux/skmsg.h | 13 +-
include/linux/soc/ti/ti_sci_protocol.h | 2 +-
include/linux/sunrpc/xdr.h | 2 +
include/linux/sunrpc/xprt.h | 3 +
include/linux/sunrpc/xprtsock.h | 2 +-
include/linux/xarray.h | 1 +
include/net/netfilter/nf_conntrack_helper.h | 1 +
include/net/netfilter/nf_flow_table.h | 18 +
include/scsi/scsi_device.h | 1 +
include/sound/intel-nhlt.h | 22 +-
include/sound/pcm.h | 1 +
include/trace/events/ext4.h | 78 ++--
include/trace/events/rxrpc.h | 8 +-
include/trace/events/sched.h | 11 +-
include/uapi/linux/bpf.h | 12 +-
include/uapi/linux/loop.h | 4 +-
include/uapi/linux/omap3isp.h | 21 +-
include/uapi/linux/rfkill.h | 14 +-
include/uapi/linux/rseq.h | 20 +-
include/uapi/linux/serial_core.h | 3 +
kernel/audit.h | 4 +
kernel/auditsc.c | 87 +++-
kernel/bpf/btf.c | 55 ++-
kernel/bpf/stackmap.c | 56 ++-
kernel/debug/kdb/kdb_support.c | 2 +-
kernel/dma/debug.c | 4 +-
kernel/dma/swiotlb.c | 11 +-
kernel/events/core.c | 3 +
kernel/livepatch/core.c | 4 +-
kernel/locking/lockdep.c | 38 +-
kernel/locking/lockdep_internals.h | 6 +-
kernel/locking/lockdep_proc.c | 51 ++-
kernel/power/hibernate.c | 2 +-
kernel/power/suspend_test.c | 8 +-
kernel/printk/printk.c | 6 +-
kernel/ptrace.c | 47 ++-
kernel/rcu/rcu_segcblist.h | 4 +-
kernel/rcu/tree.c | 71 ++--
kernel/rcu/tree.h | 4 +-
kernel/resource.c | 41 +-
kernel/rseq.c | 8 +-
kernel/sched/core.c | 5 +-
kernel/sched/cpuacct.c | 3 +-
kernel/sched/cpufreq_schedutil.c | 11 +-
kernel/sched/deadline.c | 12 +-
kernel/sched/debug.c | 10 -
kernel/sched/fair.c | 18 +-
kernel/sched/rt.c | 32 +-
kernel/sched/sched.h | 181 ++++----
kernel/trace/fgraph.c | 4 +-
kernel/trace/ftrace.c | 4 +-
kernel/trace/trace.c | 9 +-
kernel/trace/trace_events.c | 96 ++++-
kernel/trace/trace_osnoise.c | 4 +-
kernel/trace/trace_sched_switch.c | 1 +
kernel/trace/trace_sched_wakeup.c | 1 +
kernel/watch_queue.c | 4 +-
lib/kunit/try-catch.c | 2 +-
lib/raid6/test/Makefile | 4 +-
lib/raid6/test/test.c | 1 -
lib/test_kmod.c | 1 +
lib/test_lockup.c | 11 +-
lib/test_xarray.c | 22 +
lib/vsprintf.c | 48 ++-
lib/xarray.c | 4 +
mm/kmemleak.c | 9 +-
mm/madvise.c | 3 +-
mm/memcontrol.c | 2 +-
mm/memory.c | 57 ++-
mm/mempolicy.c | 8 +-
mm/migrate.c | 47 +--
mm/mlock.c | 7 +-
mm/mmap.c | 2 +-
mm/page_alloc.c | 9 +-
mm/slab.c | 1 +
mm/usercopy.c | 5 +-
mm/vmstat.c | 13 +-
net/ax25/af_ax25.c | 18 +-
net/ax25/ax25_subr.c | 20 +-
net/bluetooth/eir.h | 5 +
net/bluetooth/hci_conn.c | 2 +
net/bluetooth/hci_event.c | 13 +-
net/bluetooth/hci_sync.c | 2 +-
net/bluetooth/mgmt.c | 18 +-
net/can/isotp.c | 69 +--
net/core/skbuff.c | 51 ++-
net/core/skmsg.c | 17 +-
net/dsa/dsa2.c | 5 +
net/dsa/switch.c | 40 +-
net/ipv4/route.c | 18 +-
net/ipv4/tcp_bpf.c | 14 +-
net/ipv4/tcp_output.c | 5 +-
net/mac80211/ieee80211_i.h | 2 +-
net/mac80211/mesh.c | 2 +-
net/mac80211/mlme.c | 11 +-
net/mac80211/util.c | 27 +-
net/mptcp/protocol.c | 1 +
net/netfilter/nf_conntrack_helper.c | 6 +
net/netfilter/nf_conntrack_proto_tcp.c | 17 +-
net/netfilter/nf_flow_table_inet.c | 17 +
net/netfilter/nf_flow_table_ip.c | 18 -
net/netfilter/nft_ct.c | 3 +
net/netlink/af_netlink.c | 2 +
net/openvswitch/conntrack.c | 118 +++---
net/openvswitch/flow_netlink.c | 4 +-
net/rfkill/core.c | 48 ++-
net/rxrpc/ar-internal.h | 15 +-
net/rxrpc/call_event.c | 2 +-
net/rxrpc/call_object.c | 40 +-
net/rxrpc/server_key.c | 7 +-
net/sched/act_ct.c | 15 +-
net/sctp/sm_statefuns.c | 8 +-
net/sunrpc/clnt.c | 6 +-
net/sunrpc/sched.c | 22 +-
net/sunrpc/sysfs.c | 55 ++-
net/sunrpc/xprt.c | 10 +
net/sunrpc/xprtrdma/transport.c | 8 +-
net/sunrpc/xprtsock.c | 56 ++-
net/tipc/socket.c | 3 +-
net/unix/af_unix.c | 16 +-
net/vmw_vsock/virtio_transport.c | 11 +-
net/x25/af_x25.c | 11 +-
net/xdp/xsk.c | 69 ++-
net/xdp/xsk_buff_pool.c | 8 +-
samples/bpf/xdpsock_user.c | 6 +-
samples/landlock/sandboxer.c | 1 +
scripts/atomic/fallbacks/read_acquire | 11 +-
scripts/atomic/fallbacks/set_release | 7 +-
scripts/dtc/Makefile | 2 +-
scripts/gcc-plugins/stackleak_plugin.c | 25 +-
scripts/mod/modpost.c | 2 +-
security/integrity/evm/evm_main.c | 2 +-
security/keys/keyctl_pkey.c | 14 +-
security/keys/trusted-keys/trusted_core.c | 6 +-
security/landlock/syscalls.c | 2 +-
security/security.c | 24 +-
security/selinux/hooks.c | 180 +++++---
security/selinux/include/policycap.h | 1 +
security/selinux/include/policycap_names.h | 3 +-
security/selinux/include/security.h | 7 +
security/selinux/selinuxfs.c | 2 +
security/selinux/xfrm.c | 2 +-
security/smack/smack_lsm.c | 2 +-
security/tomoyo/load_policy.c | 4 +-
sound/core/pcm.c | 1 +
sound/core/pcm_lib.c | 9 +-
sound/core/pcm_native.c | 39 +-
sound/firewire/fcp.c | 4 +-
sound/hda/intel-dsp-config.c | 36 +-
sound/hda/intel-nhlt.c | 22 +
sound/isa/cs423x/cs4236.c | 8 +-
sound/pci/hda/hda_intel.c | 10 +-
sound/pci/hda/patch_hdmi.c | 8 +-
sound/pci/hda/patch_realtek.c | 15 +-
sound/soc/amd/acp/acp-mach-common.c | 2 +
sound/soc/amd/vangogh/acp5x-mach.c | 1 +
sound/soc/amd/vangogh/acp5x-pcm-dma.c | 68 +--
sound/soc/atmel/atmel_ssc_dai.c | 5 +-
sound/soc/atmel/mikroe-proto.c | 20 +-
sound/soc/atmel/sam9g20_wm8731.c | 1 +
sound/soc/atmel/sam9x5_wm8731.c | 13 +-
sound/soc/codecs/Kconfig | 5 +
sound/soc/codecs/cs35l41.c | 6 +-
sound/soc/codecs/cs42l42.c | 14 +-
sound/soc/codecs/lpass-rx-macro.c | 14 +-
sound/soc/codecs/lpass-tx-macro.c | 2 +
sound/soc/codecs/lpass-va-macro.c | 4 +-
sound/soc/codecs/lpass-wsa-macro.c | 2 +
sound/soc/codecs/max98927.c | 1 +
sound/soc/codecs/msm8916-wcd-analog.c | 22 +-
sound/soc/codecs/msm8916-wcd-digital.c | 5 +-
sound/soc/codecs/mt6358.c | 4 +
sound/soc/codecs/rk817_codec.c | 6 +-
sound/soc/codecs/rt5663.c | 2 +
sound/soc/codecs/rt5682s.c | 26 +-
sound/soc/codecs/rt5682s.h | 1 -
sound/soc/codecs/wcd934x.c | 12 +-
sound/soc/codecs/wcd938x.c | 10 +-
sound/soc/codecs/wm8350.c | 28 +-
sound/soc/dwc/dwc-i2s.c | 17 +-
sound/soc/fsl/fsl_spdif.c | 2 +
sound/soc/fsl/imx-es8328.c | 1 +
sound/soc/generic/simple-card-utils.c | 15 +
sound/soc/intel/boards/sof_es8336.c | 63 ++-
sound/soc/intel/boards/sof_sdw.c | 2 +-
sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 7 +-
sound/soc/intel/common/soc-acpi-intel-cml-match.c | 7 +-
sound/soc/intel/common/soc-acpi-intel-glk-match.c | 7 +-
sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 7 +-
sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 7 +-
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 23 +-
.../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 18 +-
.../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 4 +-
sound/soc/mxs/mxs-saif.c | 5 +-
sound/soc/mxs/mxs-sgtl5000.c | 3 +
sound/soc/rockchip/rockchip_i2s.c | 15 +-
sound/soc/rockchip/rockchip_i2s_tdm.c | 12 +-
sound/soc/sh/fsi.c | 19 +-
sound/soc/sh/rz-ssi.c | 73 ++--
sound/soc/soc-compress.c | 5 +
sound/soc/soc-core.c | 2 +-
sound/soc/soc-generic-dmaengine-pcm.c | 6 +-
sound/soc/soc-topology.c | 3 +-
sound/soc/sof/debug.c | 2 +-
sound/soc/sof/imx/imx8m.c | 1 +
sound/soc/sof/intel/Kconfig | 1 +
sound/soc/sof/intel/hda-dai.c | 13 +
sound/soc/sof/intel/hda-loader.c | 11 +-
sound/soc/sof/intel/hda-pcm.c | 1 +
sound/soc/sof/intel/hda.c | 61 +--
sound/soc/ti/davinci-i2s.c | 5 +-
sound/soc/xilinx/xlnx_formatter_pcm.c | 25 ++
sound/spi/at73c213.c | 27 +-
tools/bpf/bpftool/btf.c | 2 +-
tools/bpf/bpftool/gen.c | 2 +-
tools/bpf/bpftool/link.c | 3 +-
tools/bpf/bpftool/map.c | 42 +-
tools/bpf/bpftool/pids.c | 3 +-
tools/bpf/bpftool/prog.c | 2 +-
tools/include/uapi/linux/bpf.h | 4 +-
tools/lib/bpf/bpf_tracing.h | 4 +-
tools/lib/bpf/btf.h | 22 +-
tools/lib/bpf/btf_dump.c | 11 +-
tools/lib/bpf/libbpf.c | 47 ++-
tools/lib/bpf/libbpf.map | 2 +-
tools/lib/bpf/netlink.c | 63 ++-
tools/lib/bpf/xsk.c | 11 +
tools/lib/perf/tests/test-evlist.c | 8 +-
tools/perf/arch/x86/util/evlist.c | 18 +-
tools/perf/builtin-stat.c | 2 +-
tools/perf/pmu-events/arch/x86/skylakex/cache.json | 111 ++---
.../arch/x86/skylakex/floating-point.json | 24 +-
.../pmu-events/arch/x86/skylakex/frontend.json | 18 +-
.../perf/pmu-events/arch/x86/skylakex/memory.json | 96 ++---
.../pmu-events/arch/x86/skylakex/pipeline.json | 11 +
.../pmu-events/arch/x86/skylakex/skx-metrics.json | 461 ++++++++++++++++++---
.../pmu-events/arch/x86/skylakex/uncore-other.json | 23 +
tools/perf/tests/shell/test_arm_callgraph_fp.sh | 68 +++
tools/testing/cxl/Kbuild | 2 +-
tools/testing/cxl/test/cxl.c | 2 +-
tools/testing/selftests/bpf/prog_tests/bind_perm.c | 20 +-
tools/testing/selftests/bpf/progs/bpf_misc.h | 19 +
.../testing/selftests/bpf/progs/test_probe_user.c | 15 +-
.../testing/selftests/bpf/progs/test_sock_fields.c | 2 +-
tools/testing/selftests/bpf/test_lirc_mode2.sh | 5 +-
tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 10 +-
.../selftests/bpf/test_xdp_redirect_multi.sh | 60 +--
tools/testing/selftests/bpf/xdpxceiver.c | 5 +-
tools/testing/selftests/lkdtm/config | 1 +
.../testing/selftests/net/af_unix/test_unix_oob.c | 6 +-
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 19 +
.../testing/selftests/net/test_vxlan_under_vrf.sh | 8 +-
tools/testing/selftests/net/timestamping.c | 4 +-
tools/testing/selftests/net/tls.c | 6 +
tools/testing/selftests/rcutorture/bin/torture.sh | 4 +-
tools/testing/selftests/sgx/Makefile | 2 +-
tools/testing/selftests/sgx/load.c | 9 +-
tools/testing/selftests/sgx/main.c | 5 +-
tools/testing/selftests/vm/Makefile | 6 +-
tools/testing/selftests/vm/userfaultfd.c | 3 +
tools/testing/selftests/x86/Makefile | 6 +-
tools/testing/selftests/x86/check_cc.sh | 2 +-
tools/tracing/rtla/src/osnoise_hist.c | 2 +-
virt/kvm/kvm_main.c | 13 +
virt/kvm/pfncache.c | 1 +
1147 files changed, 11879 insertions(+), 6157 deletions(-)Greg Kroah-Hartman
maintainerPATCH 6/1126 mm: kfence: fix missing objcg housekeeping for SLAB
From: Muchun Song <[email protected]>
commit ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 upstream.
The objcg is not cleared and put for kfence object when it is freed, which could lead to memory leak for struct obj_cgroup and wrong statistics of NR_SLAB_RECLAIMABLE_B or NR_SLAB_UNRECLAIMABLE_B.
Since the last freed object's objcg is not cleared, mem_cgroup_from_obj() could return the wrong memcg when this kfence object, which is not charged to any objcgs, is reallocated to other users.
A real word issue [1] is caused by this bug.
--- mm/slab.c | 1 + 1 file changed, 1 insertion(+)
mm/slab.c +1 -0
@@ -3421,6 +3421,7 @@ static __always_inline void __cache_freeif (is_kfence_address (objp)) {kmemleak_free_recursive (objp, cachep->flags); +memcg_slab_free_hook (cachep, &objp,1 );__kfence_free (objp);return ; }
Greg Kroah-Hartman
maintainerPATCH 8/1126 drm/amdgpu: move PX checking into amdgpu_device_ip_early_init
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit 901e2be20dc55079997ea1885ea77fc72e6826e7 upstream.
We need to set the APU flag from IP discovery before we evaluate this code.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +13 -0
@@ -31,6 +31,7 @@#include <linux/console.h> #include <linux/slab.h> #include <linux/iommu.h> +#include <linux/pci.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_probe_helper.h>
@@ -2073,6 +2074,8 @@ out:*/ static int amdgpu_device_ip_early_init (struct amdgpu_device *adev) { +struct drm_device *dev =adev_to_drm (adev); +struct pci_dev *parent;int i, r;amdgpu_device_enable_virtual_display (adev);
@@ -2137,6 +2140,16 @@ static int amdgpu_device_ip_early_init(sbreak ; } +if (amdgpu_has_atpx () && + (amdgpu_is_atpx_hybrid () || +amdgpu_has_atpx_dgpu_power_cntl ()) && + ((adev->flags &AMD_IS_APU ) ==0 ) && + !pci_is_thunderbolt_attached (to_pci_dev (dev->dev))) + adev->flags |=AMD_IS_PX ; + + parent =pci_upstream_bridge (adev->pdev); + adev->has_pr3 = parent ?pci_pr3_present (parent) : false; +amdgpu_amdkfd_device_probe (adev); adev->pm.pp_feature = amdgpu_pp_feature_mask;
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0 -11
@@ -152,21 +152,10 @@ static void amdgpu_get_audio_func(structint amdgpu_driver_load_kms (struct amdgpu_device *adev,unsigned long flags) {struct drm_device *dev; -struct pci_dev *parent;int r, acpi_status; dev =adev_to_drm (adev); -if (amdgpu_has_atpx () && - (amdgpu_is_atpx_hybrid () || -amdgpu_has_atpx_dgpu_power_cntl ()) && - ((flags &AMD_IS_APU ) ==0 ) && - !pci_is_thunderbolt_attached (to_pci_dev (dev->dev))) - flags |=AMD_IS_PX ; - - parent =pci_upstream_bridge (adev->pdev); - adev->has_pr3 = parent ?pci_pr3_present (parent) : false; -/* amdgpu_device_init should report only fatal error * like memory allocation failure or iomapping failure, * or memory manager initialization failure, it must
Greg Kroah-Hartman
maintainerPATCH 4/1126 USB: serial: pl2303: fix GS type detection
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 5b6ab28d06780c87320ceade61698bb6719c85db upstream.
At least some PL2303GS have a bcdDevice of 0x605 instead of 0x100 as the datasheet claims. Add it to the list of known release numbers for the HXN (G) type.
--- drivers/usb/serial/pl2303.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -436,6 +436,7 @@ static int pl2303_detect_type(struct usbcase 0x105 :case 0x305 :case 0x405 : +case 0x605 :/* * Assume it's an HXN-type if the device doesn't * support the old read request value.
Greg Kroah-Hartman
maintainerPATCH 9/1126 drm/amdgpu: only check for _PR3 on dGPUs
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit 85ac2021fe3ace59cc0afd6edf005abad35625b0 upstream.
We don't support runtime pm on APUs. They support more dynamic power savings using clock and powergating.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -2
@@ -2147,8 +2147,10 @@ static int amdgpu_device_ip_early_init(s !pci_is_thunderbolt_attached(to_pci_dev(dev->dev))) adev->flags |= AMD_IS_PX; - parent =pci_upstream_bridge (adev->pdev); - adev->has_pr3 = parent ?pci_pr3_present (parent) : false; +if (!(adev->flags &AMD_IS_APU )) { + parent =pci_upstream_bridge (adev->pdev); + adev->has_pr3 = parent ?pci_pr3_present (parent) : false; + }amdgpu_amdkfd_device_probe (adev);
Greg Kroah-Hartman
maintainerPATCH 22/1126 bus: mhi: pci_generic: Add mru_default for Quectel EM1xx series
In reply to Greg Kroah-HartmanFrom: Yonglin Tan <[email protected]>
commit 2413ffbf19a95cfcd7adf63135c5a9343a66d0a2 upstream.
For default mechanism, the driver uses default MRU 3500 if mru_default is not initialized. The Qualcomm configured the MRU size to 32768 in the WWAN device FW. So, we align the driver setting with Qualcomm FW setting.
--- drivers/bus/mhi/pci_generic.c | 1 + 1 file changed, 1 insertion(+)
drivers/bus/mhi/pci_generic.c +1 -0
@@ -327,6 +327,7 @@ static const struct mhi_pci_dev_info mhi .config = &modem_quectel_em1xx_config, .bar_num = MHI_PCI_DEFAULT_BAR_NUM, .dma_data_width = 32, + .mru_default = 32768, .sideband_wake = true, };
Greg Kroah-Hartman
maintainerPATCH 23/1126 bus: mhi: Fix pm_state conversion to string
In reply to Greg Kroah-HartmanFrom: Paul Davey <[email protected]>
commit 64f93a9a27c1970fa8ee5ffc5a6ae2bda477ec5b upstream.
On big endian architectures the mhi debugfs files which report pm state give "Invalid State" for all states. This is caused by using find_last_bit which takes an unsigned long* while the state is passed in as an enum mhi_pm_state which will be of int size.
Fix by using __fls to pass the value of state instead of find_last_bit.
Also the current API expects "mhi_pm_state" enumerator as the function argument but the function only works with bitmasks. So as Alex suggested, let's change the argument to u32 to avoid confusion.
--- drivers/bus/mhi/core/init.c | 10 ++++++---- drivers/bus/mhi/core/internal.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/bus/mhi/core/init.c +6 -4
@@ -77,12 +77,14 @@ static const char * const mhi_pm_state_s [MHI_PM_STATE_LD_ERR_FATAL_DETECT] = "Linkdown or Error Fatal Detect", }; -const char *to_mhi_pm_state_str (enum mhi_pm_state state) +const char *to_mhi_pm_state_str (u32 state) { -unsigned long pm_state = state; -int index =find_last_bit (&pm_state,32 ); +int index; -if (index >=ARRAY_SIZE (mhi_pm_state_str)) +if (state) + index =__fls (state); + +if (!state || index >=ARRAY_SIZE (mhi_pm_state_str))return "Invalid State" ;return mhi_pm_state_str[index];
drivers/bus/mhi/core/internal.h +1 -1
@@ -622,7 +622,7 @@ void mhi_free_bhie_table(struct mhi_contenum mhi_pm_state __must_check mhi_tryset_pm_state (struct mhi_controller *mhi_cntrl,enum mhi_pm_state state); -const char *to_mhi_pm_state_str (enum mhi_pm_state state); +const char *to_mhi_pm_state_str (u32 state);int mhi_queue_state_transition (struct mhi_controller *mhi_cntrl,enum dev_st_transition state);void mhi_pm_st_worker (struct work_struct *work);
Greg Kroah-Hartman
maintainerPATCH 24/1126 bus: mhi: Fix MHI DMA structure endianness
In reply to Greg Kroah-HartmanFrom: Paul Davey <[email protected]>
commit ed2d980503235829aa3e0c7ae3b82374c30a081c upstream.
The MHI driver does not work on big endian architectures. The controller never transitions into mission mode. This appears to be due to the modem device expecting the various contexts and transfer rings to have fields in little endian order in memory, but the driver constructs them in native endianness.
Fix MHI event, channel and command contexts and TRE handling macros to use explicit conversion to little endian. Mark fields in relevant structures as little endian to document this requirement.
--- drivers/bus/mhi/core/debugfs.c | 26 ++++---- drivers/bus/mhi/core/init.c | 36 ++++++------ drivers/bus/mhi/core/internal.h | 119 ++++++++++++++++++++-------------------- drivers/bus/mhi/core/main.c | 22 +++---- drivers/bus/mhi/core/pm.c | 4 - 5 files changed, 104 insertions(+), 103 deletions(-)
drivers/bus/mhi/core/debugfs.c +13 -13
@@ -60,16 +60,16 @@ static int mhi_debugfs_events_show(struc }seq_printf (m,"Index: %d intmod count: %lu time: %lu" , - i, (er_ctxt->intmod &EV_CTX_INTMODC_MASK ) >> + i, (le32_to_cpu (er_ctxt->intmod) &EV_CTX_INTMODC_MASK ) >>EV_CTX_INTMODC_SHIFT , - (er_ctxt->intmod &EV_CTX_INTMODT_MASK ) >> + (le32_to_cpu (er_ctxt->intmod) &EV_CTX_INTMODT_MASK ) >>EV_CTX_INTMODT_SHIFT ); -seq_printf (m," base: 0x%0llx len: 0x%llx" , er_ctxt->rbase, - er_ctxt->rlen); +seq_printf (m," base: 0x%0llx len: 0x%llx" ,le64_to_cpu (er_ctxt->rbase), +le64_to_cpu (er_ctxt->rlen)); -seq_printf (m," rp: 0x%llx wp: 0x%llx" , er_ctxt->rp, - er_ctxt->wp); +seq_printf (m," rp: 0x%llx wp: 0x%llx" ,le64_to_cpu (er_ctxt->rp), +le64_to_cpu (er_ctxt->wp));seq_printf (m," local rp: 0x%pK db: 0x%pad\n" , ring->rp, &mhi_event->db_cfg.db_val);
@@ -106,18 +106,18 @@ static int mhi_debugfs_channels_show(strseq_printf (m,"%s(%u) state: 0x%lx brstmode: 0x%lx pollcfg: 0x%lx" , - mhi_chan->name, mhi_chan->chan, (chan_ctxt->chcfg & + mhi_chan->name, mhi_chan->chan, (le32_to_cpu (chan_ctxt->chcfg) &CHAN_CTX_CHSTATE_MASK ) >>CHAN_CTX_CHSTATE_SHIFT , - (chan_ctxt->chcfg &CHAN_CTX_BRSTMODE_MASK ) >> -CHAN_CTX_BRSTMODE_SHIFT , (chan_ctxt->chcfg & + (le32_to_cpu (chan_ctxt->chcfg) &CHAN_CTX_BRSTMODE_MASK ) >> +CHAN_CTX_BRSTMODE_SHIFT , (le32_to_cpu (chan_ctxt->chcfg) &CHAN_CTX_POLLCFG_MASK ) >>CHAN_CTX_POLLCFG_SHIFT ); -seq_printf (m," type: 0x%x event ring: %u" , chan_ctxt->chtype, - chan_ctxt->erindex); +seq_printf (m," type: 0x%x event ring: %u" ,le32_to_cpu (chan_ctxt->chtype), +le32_to_cpu (chan_ctxt->erindex));seq_printf (m," base: 0x%llx len: 0x%llx rp: 0x%llx wp: 0x%llx" , - chan_ctxt->rbase, chan_ctxt->rlen, chan_ctxt->rp, - chan_ctxt->wp); +le64_to_cpu (chan_ctxt->rbase),le64_to_cpu (chan_ctxt->rlen), +le64_to_cpu (chan_ctxt->rp),le64_to_cpu (chan_ctxt->wp)); seq_printf(m, " local rp: 0x%pK local wp: 0x%pK db: 0x%pad\n", ring->rp, ring->wp,
drivers/bus/mhi/core/init.c +18 -18
@@ -293,17 +293,17 @@ int mhi_init_dev_ctxt(struct mhi_controlif (mhi_chan->offload_ch)continue ; - tmp = chan_ctxt->chcfg; + tmp =le32_to_cpu (chan_ctxt->chcfg); tmp &= ~CHAN_CTX_CHSTATE_MASK ; tmp |= (MHI_CH_STATE_DISABLED <<CHAN_CTX_CHSTATE_SHIFT ); tmp &= ~CHAN_CTX_BRSTMODE_MASK ; tmp |= (mhi_chan->db_cfg.brstmode <<CHAN_CTX_BRSTMODE_SHIFT ); tmp &= ~CHAN_CTX_POLLCFG_MASK ; tmp |= (mhi_chan->db_cfg.pollcfg <<CHAN_CTX_POLLCFG_SHIFT ); - chan_ctxt->chcfg = tmp; + chan_ctxt->chcfg =cpu_to_le32 (tmp); - chan_ctxt->chtype = mhi_chan->type; - chan_ctxt->erindex = mhi_chan->er_index; + chan_ctxt->chtype =cpu_to_le32 (mhi_chan->type); + chan_ctxt->erindex =cpu_to_le32 (mhi_chan->er_index); mhi_chan->ch_state =MHI_CH_STATE_DISABLED ; mhi_chan->tre_ring.db_addr = (void __iomem *)&chan_ctxt->wp;
@@ -328,14 +328,14 @@ int mhi_init_dev_ctxt(struct mhi_controlif (mhi_event->offload_ev)continue ; - tmp = er_ctxt->intmod; + tmp =le32_to_cpu (er_ctxt->intmod); tmp &= ~EV_CTX_INTMODC_MASK ; tmp &= ~EV_CTX_INTMODT_MASK ; tmp |= (mhi_event->intmod <<EV_CTX_INTMODT_SHIFT ); - er_ctxt->intmod = tmp; + er_ctxt->intmod =cpu_to_le32 (tmp); - er_ctxt->ertype =MHI_ER_TYPE_VALID ; - er_ctxt->msivec = mhi_event->irq; + er_ctxt->ertype =cpu_to_le32 (MHI_ER_TYPE_VALID ); + er_ctxt->msivec =cpu_to_le32 (mhi_event->irq); mhi_event->db_cfg.db_mode = true; ring->el_size =sizeof (struct mhi_tre );
@@ -349,9 +349,9 @@ int mhi_init_dev_ctxt(struct mhi_control* ring is empty */ ring->rp = ring->wp = ring->base; - er_ctxt->rbase = ring->iommu_base; + er_ctxt->rbase =cpu_to_le64 (ring->iommu_base); er_ctxt->rp = er_ctxt->wp = er_ctxt->rbase; - er_ctxt->rlen = ring->len; + er_ctxt->rlen =cpu_to_le64 (ring->len); ring->ctxt_wp = &er_ctxt->wp; }
@@ -378,9 +378,9 @@ int mhi_init_dev_ctxt(struct mhi_control goto error_alloc_cmd; ring->rp = ring->wp = ring->base; - cmd_ctxt->rbase = ring->iommu_base; + cmd_ctxt->rbase =cpu_to_le64 (ring->iommu_base); cmd_ctxt->rp = cmd_ctxt->wp = cmd_ctxt->rbase; - cmd_ctxt->rlen = ring->len; + cmd_ctxt->rlen =cpu_to_le64 (ring->len); ring->ctxt_wp = &cmd_ctxt->wp; }
@@ -581,10 +581,10 @@ void mhi_deinit_chan_ctxt(struct mhi_con chan_ctxt->rp =0 ; chan_ctxt->wp =0 ; - tmp = chan_ctxt->chcfg; + tmp =le32_to_cpu (chan_ctxt->chcfg); tmp &= ~CHAN_CTX_CHSTATE_MASK ; tmp |= (MHI_CH_STATE_DISABLED <<CHAN_CTX_CHSTATE_SHIFT ); - chan_ctxt->chcfg = tmp; + chan_ctxt->chcfg =cpu_to_le32 (tmp);/* Update to all cores */ smp_wmb ();
@@ -618,14 +618,14 @@ int mhi_init_chan_ctxt(struct mhi_controreturn -ENOMEM ; } - tmp = chan_ctxt->chcfg; + tmp =le32_to_cpu (chan_ctxt->chcfg); tmp &= ~CHAN_CTX_CHSTATE_MASK ; tmp |= (MHI_CH_STATE_ENABLED <<CHAN_CTX_CHSTATE_SHIFT ); - chan_ctxt->chcfg = tmp; + chan_ctxt->chcfg =cpu_to_le32 (tmp); - chan_ctxt->rbase = tre_ring->iommu_base; + chan_ctxt->rbase =cpu_to_le64 (tre_ring->iommu_base); chan_ctxt->rp = chan_ctxt->wp = chan_ctxt->rbase; - chan_ctxt->rlen = tre_ring->len; + chan_ctxt->rlen =cpu_to_le64 (tre_ring->len); tre_ring->ctxt_wp = &chan_ctxt->wp; tre_ring->rp = tre_ring->wp = tre_ring->base;
drivers/bus/mhi/core/internal.h +60 -59
171 lines not on this page · raw message
drivers/bus/mhi/core/main.c +11 -11
@@ -114,7 +114,7 @@ void mhi_ring_er_db(struct mhi_event *mhstruct mhi_ring *ring = &mhi_event->ring; mhi_event->db_cfg.process_db (mhi_event->mhi_cntrl, &mhi_event->db_cfg, - ring->db_addr, *ring->ctxt_wp); + ring->db_addr,le64_to_cpu (*ring->ctxt_wp)); }void mhi_ring_cmd_db (struct mhi_controller *mhi_cntrl,struct mhi_cmd *mhi_cmd)
@@ -123,7 +123,7 @@ void mhi_ring_cmd_db(struct mhi_controllstruct mhi_ring *ring = &mhi_cmd->ring; db = ring->iommu_base + (ring->wp - ring->base); - *ring->ctxt_wp = db; + *ring->ctxt_wp =cpu_to_le64 (db);mhi_write_db (mhi_cntrl, ring->db_addr, db); }
@@ -140,7 +140,7 @@ void mhi_ring_chan_db(struct mhi_control* before letting h/w know there is new element to fetch. */ dma_wmb (); - *ring->ctxt_wp = db; + *ring->ctxt_wp =cpu_to_le64 (db); mhi_chan->db_cfg.process_db (mhi_cntrl, &mhi_chan->db_cfg, ring->db_addr, db);
@@ -432,7 +432,7 @@ irqreturn_t mhi_irq_handler(int irq_numbstruct mhi_event_ctxt *er_ctxt = &mhi_cntrl->mhi_ctxt->er_ctxt[mhi_event->er_index];struct mhi_ring *ev_ring = &mhi_event->ring; -dma_addr_t ptr = er_ctxt->rp; +dma_addr_t ptr =le64_to_cpu (er_ctxt->rp);void *dev_rp;if (!is_valid_ring_ptr (ev_ring, ptr)) {
@@ -537,14 +537,14 @@ static void mhi_recycle_ev_ring_element(/* Update the WP */ ring->wp += ring->el_size; - ctxt_wp = *ring->ctxt_wp + ring->el_size; + ctxt_wp =le64_to_cpu (*ring->ctxt_wp) + ring->el_size;if (ring->wp >= (ring->base + ring->len)) { ring->wp = ring->base; ctxt_wp = ring->iommu_base; } - *ring->ctxt_wp = ctxt_wp; + *ring->ctxt_wp =cpu_to_le64 (ctxt_wp);/* Update the RP */ ring->rp += ring->el_size;
@@ -801,7 +801,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_struct device *dev = &mhi_cntrl->mhi_dev->dev;u32 chan;int count =0 ; -dma_addr_t ptr = er_ctxt->rp; +dma_addr_t ptr =le64_to_cpu (er_ctxt->rp);/* * This is a quick check to avoid unnecessary event processing
@@ -940,7 +940,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_mhi_recycle_ev_ring_element (mhi_cntrl, ev_ring); local_rp = ev_ring->rp; - ptr = er_ctxt->rp; + ptr =le64_to_cpu (er_ctxt->rp);if (!is_valid_ring_ptr (ev_ring, ptr)) {dev_err (&mhi_cntrl->mhi_dev->dev,"Event ring rp points outside of the event ring\n" );
@@ -970,7 +970,7 @@ int mhi_process_data_event_ring(struct mint count =0 ;u32 chan;struct mhi_chan *mhi_chan; -dma_addr_t ptr = er_ctxt->rp; +dma_addr_t ptr =le64_to_cpu (er_ctxt->rp);if (unlikely (MHI_EVENT_ACCESS_INVALID (mhi_cntrl->pm_state)))return -EIO ;
@@ -1011,7 +1011,7 @@ int mhi_process_data_event_ring(struct mmhi_recycle_ev_ring_element (mhi_cntrl, ev_ring); local_rp = ev_ring->rp; - ptr = er_ctxt->rp; + ptr =le64_to_cpu (er_ctxt->rp);if (!is_valid_ring_ptr (ev_ring, ptr)) {dev_err (&mhi_cntrl->mhi_dev->dev,"Event ring rp points outside of the event ring\n" );
@@ -1533,7 +1533,7 @@ static void mhi_mark_stale_events(struct/* mark all stale events related to channel as STALE event */ spin_lock_irqsave (&mhi_event->lock, flags); - ptr = er_ctxt->rp; + ptr =le64_to_cpu (er_ctxt->rp);if (!is_valid_ring_ptr (ev_ring, ptr)) {dev_err (&mhi_cntrl->mhi_dev->dev,"Event ring rp points outside of the event ring\n" );
drivers/bus/mhi/core/pm.c +2 -2
@@ -218,7 +218,7 @@ int mhi_ready_state_transition(struct mhcontinue ; ring->wp = ring->base + ring->len - ring->el_size; - *ring->ctxt_wp = ring->iommu_base + ring->len - ring->el_size; + *ring->ctxt_wp =cpu_to_le64 (ring->iommu_base + ring->len - ring->el_size);/* Update all cores */ smp_wmb ();
@@ -420,7 +420,7 @@ static int mhi_pm_mission_mode_transitiocontinue ; ring->wp = ring->base + ring->len - ring->el_size; - *ring->ctxt_wp = ring->iommu_base + ring->len - ring->el_size; + *ring->ctxt_wp =cpu_to_le64 (ring->iommu_base + ring->len - ring->el_size);/* Update to all cores */ smp_wmb ();
Greg Kroah-Hartman
maintainerPATCH 25/1126 docs: sphinx/requirements: Limit jinja2<3.1
In reply to Greg Kroah-HartmanFrom: Akira Yokosawa <[email protected]>
commit be78837ca3c88eebd405103a7a2ce891c466b0db upstream.
jinja2 release 3.1.0 (March 24, 2022) broke Sphinx<4.0. This looks like the result of deprecating Python 3.6. It has been tested against Sphinx 4.3.0 and later.
Setting an upper limit of <3.1 to junja2 can unbreak Sphinx<4.0 including Sphinx 2.4.4.
--- Documentation/sphinx/requirements.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/sphinx/requirements.txt +2 -0
@@ -1,2 +1,4 @@ +# jinja2>=3.1 is not compatible with Sphinx<4.0 +jinja2<3.1 sphinx_rtd_theme Sphinx==2.4.4
Greg Kroah-Hartman
maintainerPATCH 26/1126 coresight: Fix TRCCONFIGR.QE sysfs interface
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
commit ea75a342aed5ed72c87f38fbe0df2f5df7eae374 upstream.
It's impossible to program a valid value for TRCCONFIGR.QE when TRCIDR0.QSUPP==0b10. In that case the following is true:
Q element support is implemented, and only supports Q elements without instruction counts. TRCCONFIGR.QE can only take the values 0b00 or 0b11.
Currently the low bit of QSUPP is checked to see if the low bit of QE can be written to, but as you can see when QSUPP==0b10 the low bit is cleared making it impossible to ever write the only valid value of 0b11 to QE. 0b10 would be written instead, which is a reserved QE value even for all values of QSUPP.
The fix is to allow writing the low bit of QE for any non zero value of QSUPP.
This change also ensures that the low bit is always set, even when the user attempts to only set the high bit.
--- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +6 -2
@@ -367,8 +367,12 @@ static ssize_t mode_store(struct device mode =ETM_MODE_QELEM (config->mode);/* start by clearing QE bits */ config->cfg &= ~(BIT (13 ) |BIT (14 )); -/* if supported, Q elements with instruction counts are enabled */ -if ((mode &BIT (0 )) && (drvdata->q_support &BIT (0 ))) +/* +* if supported, Q elements with instruction counts are enabled. +* Always set the low bit for any requested mode. Valid combos are +* 0b00, 0b01 and 0b11. +*/ +if (mode && drvdata->q_support) config->cfg |=BIT (13 );/* * if supported, Q elements with and without instruction
Greg Kroah-Hartman
maintainerPATCH 27/1126 coresight: syscfg: Fix memleak on registration failure in cscfg_create_device
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit cfa5dbcdd7aece76f3415284569f2f384aff0253 upstream.
device_register() calls device_initialize(),
according to doc of device_initialize:
Use put_device() to give up your reference instead of freeing
* @dev directly once you have called this function.
To prevent potential memleak, use put_device() for error handling.
--- drivers/hwtracing/coresight/coresight-syscfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-syscfg.c +1 -1
@@ -1049,7 +1049,7 @@ static int cscfg_create_device(void) err =device_register (dev);if (err) -cscfg_dev_release (dev); +put_device (dev); create_dev_exit_unlock:mutex_unlock (&cscfg_mutex);
Greg Kroah-Hartman
maintainerPATCH 28/1126 dt-bindings: iio: adc: zynqmp_ams: Add clock entry
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
commit 5165102efa41c2aedc77441612f4506a8a8671db upstream.
The AMS driver DT binding was missing the clock entry, which is actually mandatory according to the driver implementation. Add this in.
--- Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml +8 -0
@@ -92,6 +92,10 @@ properties: description: AMS Controller register space maxItems: 1 + clocks: + items: + - description: AMS reference clock + ranges: description: Maps the child address space for PS and/or PL.
@@ -181,12 +185,15 @@ properties: required: - compatible - reg + - clocks - ranges additionalProperties: false examples: - | + #include <dt-bindings/clock/xlnx-zynqmp-clk.h> + bus { #address-cells = <2>; #size-cells = <2>;
@@ -196,6 +203,7 @@ examples: interrupt-parent = <&gic>; interrupts = <0 56 4>; reg = <0x0 0xffa50000 0x0 0x800>; + clocks = <&zynqmp_clk AMS_REF>; #address-cells = <1>; #size-cells = <1>; #io-channel-cells = <1>;
Greg Kroah-Hartman
maintainerPATCH 31/1126 iio: adc: aspeed: Add divider flag to fix incorrect voltage reading.
In reply to Greg Kroah-HartmanFrom: Billy Tsai <[email protected]>
commit 571426631acf46e2999c7ecd1e9d048172969a43 upstream.
The formula for the ADC sampling period in ast2400/ast2500 is:
ADC clock period = PCLK * 2 * (ADC0C[31:17] + 1) * (ADC0C[9:0]) When ADC0C[9:0] is set to 0 the sampling voltage will be lower than expected, because the hardware may not have enough time to charge/discharge to a stable voltage. This patch use the flag CLK_DIVIDER_ONE_BASED which will use the raw value read from the register, with the value of zero considered invalid to conform to the corrected formula.
--- drivers/iio/adc/aspeed_adc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/aspeed_adc.c +3 -1
@@ -539,7 +539,9 @@ static int aspeed_adc_probe(struct platf data->clk_scaler =devm_clk_hw_register_divider ( &pdev->dev, clk_name, clk_parent_name, scaler_flags, data->base +ASPEED_REG_CLOCK_CONTROL ,0 , - data->model_data->scaler_bit_width,0 , &data->clk_lock); + data->model_data->scaler_bit_width, + data->model_data->need_prescaler ?CLK_DIVIDER_ONE_BASED :0 , + &data->clk_lock);if (IS_ERR (data->clk_scaler))return PTR_ERR (data->clk_scaler);
Greg Kroah-Hartman
maintainerPATCH 30/1126 iio: accel: mma8452: use the correct logic to get mma8452_data
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
commit c87b7b12f48db86ac9909894f4dc0107d7df6375 upstream.
The original logic to get mma8452_data is wrong, the *dev point to the device belong to iio_dev. we can't use this dev to find the correct i2c_client. The original logic happen to work because it finally use dev->driver_data to get iio_dev. Here use the API to_i2c_client() is wrong and make reader confuse. To correct the logic, it should be like this
struct mma8452_data *data = iio_priv(dev_get_drvdata(dev));
But after commit 8b7651f25962 ("iio: iio_device_alloc(): Remove unnecessary self drvdata"), the upper logic also can't work. When try to show the avialable scale in userspace, will meet kernel dump, kernel handle NULL pointer dereference.
So use dev_to_iio_dev() to correct the logic.
Dual fixes tags as the second reflects when the bug was exposed, whilst the first reflects when the original bug was introduced.
--- drivers/iio/accel/mma8452.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/accel/mma8452.c +2 -2
@@ -379,8 +379,8 @@ static ssize_t mma8452_show_scale_avail(struct device_attribute *attr, char *buf) { - struct mma8452_data *data = iio_priv(i2c_get_clientdata( -to_i2c_client (dev))); + struct iio_dev *indio_dev = dev_to_iio_dev(dev); +struct mma8452_data *data =iio_priv (indio_dev);return mma8452_show_int_plus_micros (buf, data->chip_info->mma_scales,ARRAY_SIZE (data->chip_info->mma_scales));
Greg Kroah-Hartman
maintainerPATCH 14/1126 USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 1892bf90677abcad7f06e897e308f5c3e3618dd4 upstream.
The kernel test robot found a problem with the ene_ub6250 subdriver in
usb-storage: It uses structures containing bitfields to represent hardware bits in its SD_STATUS, MS_STATUS, and SM_STATUS bytes. This is not safe; it presumes a particular bit ordering and it assumes the compiler will not insert padding, neither of which is guaranteed.
This patch fixes the problem by changing the structures to simple u8 values, with the bitfields replaced by bitmask constants.
--- drivers/usb/storage/ene_ub6250.c | 153 +++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 78 deletions(-)
drivers/usb/storage/ene_ub6250.c +75 -78
@@ -237,36 +237,33 @@ static struct us_unusual_dev ene_ub6250_#define memstick_logaddr (logadr1, logadr0) ((((u16)(logadr1)) << 8) | (logadr0)) -struct SD_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 IsMMC:1 ; -u8 HiCapacity:1 ; -u8 HiSpeed:1 ; -u8 WtP:1 ; -u8 Reserved:1 ; -}; - -struct MS_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 IsMSPro:1 ; -u8 IsMSPHG:1 ; -u8 Reserved1:1 ; -u8 WtP:1 ; -u8 Reserved2:1 ; -}; - -struct SM_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 Reserved:3 ; -u8 WtP:1 ; -u8 IsMS:1 ; -}; +/* SD_STATUS bits */ +#define SD_Insert BIT(0) +#define SD_Ready BIT(1) +#define SD_MediaChange BIT(2) +#define SD_IsMMC BIT(3) +#define SD_HiCapacity BIT(4) +#define SD_HiSpeed BIT(5) +#define SD_WtP BIT(6) +/* Bit 7 reserved */ + +/* MS_STATUS bits */ +#define MS_Insert BIT(0) +#define MS_Ready BIT(1) +#define MS_MediaChange BIT(2) +#define MS_IsMSPro BIT(3) +#define MS_IsMSPHG BIT(4) +/* Bit 5 reserved */ +#define MS_WtP BIT(6) +/* Bit 7 reserved */ + +/* SM_STATUS bits */ +#define SM_Insert BIT(0) +#define SM_Ready BIT(1) +#define SM_MediaChange BIT(2) +/* Bits 3-5 reserved */ +#define SM_WtP BIT(6) +#define SM_IsMS BIT(7)struct ms_bootblock_cis {u8 bCistplDEVICE[6 ];/* 0 */
@@ -437,9 +434,9 @@ struct ene_ub6250_info {u8 *bbuf;/* for 6250 code */ -struct SD_STATUS SD_Status; -struct MS_STATUS MS_Status; -struct SM_STATUS SM_Status; +u8 SD_Status; +u8 MS_Status; +u8 SM_Status;/* ----- SD Control Data ---------------- */ /*SD_REGISTER SD_Regs; */
@@ -602,7 +599,7 @@ static int sd_scsi_test_unit_ready(struc {struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra; -if (info->SD_Status.Insert && info->SD_Status.Ready) +if ((info->SD_Status & SD_Insert) && (info->SD_Status & SD_Ready))return USB_STOR_TRANSPORT_GOOD ;else {ene_sd_init (us);
@@ -622,7 +619,7 @@ static int sd_scsi_mode_sense(struct us_0x0b ,0x00 ,0x80 ,0x08 ,0x00 ,0x00 , 0x71, 0xc0, 0x00, 0x00, 0x02, 0x00 }; -if (info->SD_Status.WtP) +if (info->SD_Status & SD_WtP)usb_stor_set_xfer_buf (mediaWP,12 , srb);else usb_stor_set_xfer_buf (mediaNoWP,12 , srb);
@@ -641,9 +638,9 @@ static int sd_scsi_read_capacity(structstruct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;usb_stor_dbg (us,"sd_scsi_read_capacity\n" ); -if (info->SD_Status.HiCapacity) { +if (info->SD_Status & SD_HiCapacity) { bl_len =0x200 ; -if (info->SD_Status.IsMMC) +if (info->SD_Status & SD_IsMMC) bl_num = info->HC_C_SIZE-1 ;else bl_num = (info->HC_C_SIZE +1 ) *1024 -1 ;
@@ -693,7 +690,7 @@ static int sd_scsi_read(struct us_data *return USB_STOR_TRANSPORT_ERROR ; } -if (info->SD_Status.HiCapacity) +if (info->SD_Status & SD_HiCapacity) bnByte = bn;/* set up the command wrapper */
@@ -733,7 +730,7 @@ static int sd_scsi_write(struct us_datareturn USB_STOR_TRANSPORT_ERROR ; } -if (info->SD_Status.HiCapacity) +if (info->SD_Status & SD_HiCapacity) bnByte = bn;/* set up the command wrapper */
@@ -1456,7 +1453,7 @@ static int ms_scsi_test_unit_ready(strucstruct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);/* pr_info("MS_SCSI_Test_Unit_Ready\n"); */ -if (info->MS_Status.Insert && info->MS_Status.Ready) { +if ((info->MS_Status & MS_Insert) && (info->MS_Status & MS_Ready)) {return USB_STOR_TRANSPORT_GOOD ; }else {ene_ms_init (us);
@@ -1476,7 +1473,7 @@ static int ms_scsi_mode_sense(struct us_0x0b ,0x00 ,0x80 ,0x08 ,0x00 ,0x00 , 0x71, 0xc0, 0x00, 0x00, 0x02, 0x00 }; -if (info->MS_Status.WtP) +if (info->MS_Status & MS_WtP)usb_stor_set_xfer_buf (mediaWP,12 , srb);else usb_stor_set_xfer_buf (mediaNoWP,12 , srb);
@@ -1495,7 +1492,7 @@ static int ms_scsi_read_capacity(structusb_stor_dbg (us,"ms_scsi_read_capacity\n" ); bl_len =0x200 ; -if (info->MS_Status.IsMSPro) +if (info->MS_Status & MS_IsMSPro) bl_num = info->MSP_TotalBlock -1 ;else bl_num = info->MS_Lib.NumberOfLogBlock * info->MS_Lib.blockSize *2 -1 ;
@@ -1650,7 +1647,7 @@ static int ms_scsi_read(struct us_data *if (bn > info->bl_num)return USB_STOR_TRANSPORT_ERROR ; -if (info->MS_Status.IsMSPro) { +if (info->MS_Status & MS_IsMSPro) { result =ene_load_bincode (us,MSP_RW_PATTERN );if (result !=USB_STOR_XFER_GOOD ) {usb_stor_dbg (us,"Load MPS RW pattern Fail !!\n" );
@@ -1751,7 +1748,7 @@ static int ms_scsi_write(struct us_dataif (bn > info->bl_num)return USB_STOR_TRANSPORT_ERROR ; -if (info->MS_Status.IsMSPro) { +if (info->MS_Status & MS_IsMSPro) { result =ene_load_bincode (us,MSP_RW_PATTERN );if (result !=USB_STOR_XFER_GOOD ) {pr_info ("Load MSP RW pattern Fail !!\n" );
@@ -1859,12 +1856,12 @@ static int ene_get_card_status(struct us tmpreg = (u16 ) reg4b; reg4b = *(u32 *)(&buf[0x14 ]); -if (info->SD_Status.HiCapacity && !info->SD_Status.IsMMC) +if ((info->SD_Status & SD_HiCapacity) && !(info->SD_Status & SD_IsMMC)) info->HC_C_SIZE = (reg4b >>8 ) &0x3fffff ; info->SD_C_SIZE = ((tmpreg &0x03 ) <<10 ) | (u16)(reg4b >>22 ); info->SD_C_SIZE_MULT = (u8)(reg4b >>7 ) &0x07 ; -if (info->SD_Status.HiCapacity && info->SD_Status.IsMMC) +if ((info->SD_Status & SD_HiCapacity) && (info->SD_Status & SD_IsMMC)) info->HC_C_SIZE = *(u32 *)(&buf[0x100 ]);if (info->SD_READ_BL_LEN >SD_BLOCK_LEN ) {
@@ -2076,6 +2073,7 @@ static int ene_ms_init(struct us_data *uu16 MSP_BlockSize, MSP_UserAreaBlocks;struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;u8 *bbuf = info->bbuf; +unsigned int s;printk (KERN_INFO "transport --- ENE_MSInit\n" );
@@ -2100,15 +2098,16 @@ static int ene_ms_init(struct us_data *ureturn USB_STOR_TRANSPORT_ERROR ; }/* the same part to test ENE */ - info->MS_Status = *(struct MS_STATUS *) bbuf; + info->MS_Status = bbuf[0 ]; -if (info->MS_Status.Insert && info->MS_Status.Ready) { -printk (KERN_INFO "Insert = %x\n" , info->MS_Status.Insert); -printk (KERN_INFO "Ready = %x\n" , info->MS_Status.Ready); -printk (KERN_INFO "IsMSPro = %x\n" , info->MS_Status.IsMSPro); -printk (KERN_INFO "IsMSPHG = %x\n" , info->MS_Status.IsMSPHG); -printk (KERN_INFO "WtP= %x\n" , info->MS_Status.WtP); -if (info->MS_Status.IsMSPro) { + s = info->MS_Status; +if ((s & MS_Insert) && (s & MS_Ready)) { +printk (KERN_INFO "Insert = %x\n" , !!(s & MS_Insert)); +printk (KERN_INFO "Ready = %x\n" , !!(s & MS_Ready)); +printk (KERN_INFO "IsMSPro = %x\n" , !!(s & MS_IsMSPro)); +printk (KERN_INFO "IsMSPHG = %x\n" , !!(s & MS_IsMSPHG)); +printk (KERN_INFO "WtP= %x\n" , !!(s & MS_WtP)); +if (s & MS_IsMSPro) { MSP_BlockSize = (bbuf[6 ] <<8 ) | bbuf[7 ]; MSP_UserAreaBlocks = (bbuf[10 ] <<8 ) | bbuf[11 ]; info->MSP_TotalBlock = MSP_BlockSize * MSP_UserAreaBlocks;
@@ -2169,17 +2168,17 @@ static int ene_sd_init(struct us_data *ureturn USB_STOR_TRANSPORT_ERROR ; } - info->SD_Status = *(struct SD_STATUS *) bbuf; -if (info->SD_Status.Insert && info->SD_Status.Ready) { -struct SD_STATUS *s = &info->SD_Status; + info->SD_Status = bbuf[0 ]; +if ((info->SD_Status & SD_Insert) && (info->SD_Status & SD_Ready)) { +unsigned int s = info->SD_Status;ene_get_card_status (us, bbuf); -usb_stor_dbg (us,"Insert = %x\n" , s->Insert); -usb_stor_dbg (us,"Ready = %x\n" , s->Ready); -usb_stor_dbg (us,"IsMMC = %x\n" , s->IsMMC); -usb_stor_dbg (us,"HiCapacity = %x\n" , s->HiCapacity); -usb_stor_dbg (us,"HiSpeed = %x\n" , s->HiSpeed); -usb_stor_dbg (us,"WtP = %x\n" , s->WtP); +usb_stor_dbg (us,"Insert = %x\n" , !!(s & SD_Insert)); +usb_stor_dbg (us,"Ready = %x\n" , !!(s & SD_Ready)); +usb_stor_dbg (us,"IsMMC = %x\n" , !!(s & SD_IsMMC)); +usb_stor_dbg (us,"HiCapacity = %x\n" , !!(s & SD_HiCapacity)); +usb_stor_dbg (us,"HiSpeed = %x\n" , !!(s & SD_HiSpeed)); +usb_stor_dbg (us,"WtP = %x\n" , !!(s & SD_WtP)); }else {usb_stor_dbg (us,"SD Card Not Ready --- %x\n" , bbuf[0 ]);return USB_STOR_TRANSPORT_ERROR ;
@@ -2201,14 +2200,14 @@ static int ene_init(struct us_data *us) misc_reg03 = bbuf[0 ];if (misc_reg03 &0x01 ) { -if (!info->SD_Status.Ready) { +if (!(info->SD_Status & SD_Ready)) { result =ene_sd_init (us);if (result !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ; } }if (misc_reg03 &0x02 ) { -if (!info->MS_Status.Ready) { +if (!(info->MS_Status & MS_Ready)) { result =ene_ms_init (us);if (result !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ;
@@ -2307,14 +2306,14 @@ static int ene_transport(struct scsi_cmn/*US_DEBUG(usb_stor_show_command(us, srb)); */ scsi_set_resid (srb,0 ); -if (unlikely (!(info->SD_Status.Ready || info->MS_Status.Ready))) +if (unlikely (!(info->SD_Status & SD_Ready) || (info->MS_Status & MS_Ready))) result =ene_init (us);if (result ==USB_STOR_XFER_GOOD ) { result =USB_STOR_TRANSPORT_ERROR ; -if (info->SD_Status.Ready) +if (info->SD_Status & SD_Ready) result =sd_scsi_irp (us, srb); -if (info->MS_Status.Ready) +if (info->MS_Status & MS_Ready) result =ms_scsi_irp (us, srb); }return result;
@@ -2378,7 +2377,6 @@ static int ene_ub6250_probe(struct usb_istatic int ene_ub6250_resume (struct usb_interface *iface) { -u8 tmp =0 ;struct us_data *us =usb_get_intfdata (iface);struct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);
@@ -2390,17 +2388,16 @@ static int ene_ub6250_resume(struct usb_mutex_unlock (&us->dev_mutex); info->Power_IsResum = true; -/*info->SD_Status.Ready = 0; */ - info->SD_Status = *(struct SD_STATUS *)&tmp; - info->MS_Status = *(struct MS_STATUS *)&tmp; - info->SM_Status = *(struct SM_STATUS *)&tmp; +/* info->SD_Status &= ~SD_Ready; */ + info->SD_Status =0 ; + info->MS_Status =0 ; + info->SM_Status =0 ;return 0 ; }static int ene_ub6250_reset_resume (struct usb_interface *iface) { -u8 tmp =0 ;struct us_data *us =usb_get_intfdata (iface);struct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);
@@ -2412,10 +2409,10 @@ static int ene_ub6250_reset_resume(struc* the device */ info->Power_IsResum = true; -/*info->SD_Status.Ready = 0; */ - info->SD_Status = *(struct SD_STATUS *)&tmp; - info->MS_Status = *(struct MS_STATUS *)&tmp; - info->SM_Status = *(struct SM_STATUS *)&tmp; +/* info->SD_Status &= ~SD_Ready; */ + info->SD_Status =0 ; + info->MS_Status =0 ; + info->SM_Status =0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 29/1126 iio: adc: xilinx-ams: Fix single channel switching sequence
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
commit 0bf126163c3e7e6d722622073046aed567a5551e upstream.
Some of the AMS channels need to be read by switching into single-channel mode from the normal polling sequence. There was a logic issue in this switching code that could cause the first read of these channels to read back as zero.
It appears that the sequencer should be set back to default mode before changing the channel selection, and the channel should be set before switching the sequencer back into single-channel mode.
Also, write 1 to the EOC bit in the status register to clear it before waiting for it to become set, so that we actually wait for a new conversion to complete, and don't proceed based on a previous conversion completing.
--- drivers/iio/adc/xilinx-ams.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/iio/adc/xilinx-ams.c +8 -2
@@ -530,14 +530,18 @@ static int ams_enable_single_channel(strreturn -EINVAL ; } -/* set single channel, sequencer off mode */ +/* put sysmon in a soft reset to change the sequence */ ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , -AMS_CONF1_SEQ_SINGLE_CHANNEL ); +AMS_CONF1_SEQ_DEFAULT );/* write the channel number */ ams_ps_update_reg (ams,AMS_REG_CONFIG0 ,AMS_CONF0_CHANNEL_NUM_MASK , channel_num); +/* set single channel, sequencer off mode */ +ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_SINGLE_CHANNEL ); +return 0 ; }
@@ -551,6 +555,8 @@ static int ams_read_vcc_reg(struct ams *if (ret)return ret; +/* clear end-of-conversion flag, wait for next conversion to complete */ +writel (expect, ams->base +AMS_ISR_1 ); ret =readl_poll_timeout (ams->base +AMS_ISR_1 , reg, (reg & expect),AMS_INIT_POLL_TIME_US ,AMS_INIT_TIMEOUT_US );if (ret)
Greg Kroah-Hartman
maintainerPATCH 32/1126 iio: imu: st_lsm6dsx: use dev_to_iio_dev() to get iio_dev struct
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
commit 6270bf1f0197739a9cddaf0a40699a99b7357cb5 upstream.
dev_get_drvdata() on iio_dev->dev no longer returns the iio_dev. Use dev_to_iio_dev() to get iio_dev struct.
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +2 -2
@@ -1633,7 +1633,7 @@ st_lsm6dsx_sysfs_sampling_frequency_avaistruct device_attribute *attr, char *buf) { - struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev)); + struct st_lsm6dsx_sensor *sensor = iio_priv(dev_to_iio_dev(dev));const struct st_lsm6dsx_odr_table_entry *odr_table;int i, len =0 ;
@@ -1651,7 +1651,7 @@ static ssize_t st_lsm6dsx_sysfs_scale_avstruct device_attribute *attr, char *buf) { - struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev)); + struct st_lsm6dsx_sensor *sensor = iio_priv(dev_to_iio_dev(dev));const struct st_lsm6dsx_fs_table_entry *fs_table;struct st_lsm6dsx_hw *hw = sensor->hw;int i, len =0 ;
Greg Kroah-Hartman
maintainerPATCH 34/1126 iio: adc: xilinx-ams: Fixed missing PS channels
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
commit 1f21a41578062d439cc485bce2d8b664f9a6170e upstream.
The code forgot to increment num_channels for the PS channel inputs, resulting in them not being enabled as they should.
--- drivers/iio/adc/xilinx-ams.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/xilinx-ams.c +1 -0
@@ -1230,6 +1230,7 @@ static int ams_init_module(struct iio_de/* add PS channels to iio device channels */ memcpy (channels, ams_ps_channels,sizeof (ams_ps_channels)); + num_channels =ARRAY_SIZE (ams_ps_channels); }else if (fwnode_property_match_string (fwnode,"compatible" ,"xlnx,zynqmp-ams-pl" ) ==0 ) { ams->pl_base =fwnode_iomap (fwnode,0 );
Greg Kroah-Hartman
maintainerPATCH 35/1126 iio: adc: xilinx-ams: Fixed wrong sequencer register settings
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
commit d5d786fb531697be74c567b3844c6897ddf1ffdd upstream.
Register settings used for the sequencer configuration register were incorrect, causing some inputs to not be read properly.
--- drivers/iio/adc/xilinx-ams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/xilinx-ams.c +2 -2
@@ -91,8 +91,8 @@#define AMS_CONF1_SEQ_MASK GENMASK(15, 12)#define AMS_CONF1_SEQ_DEFAULT FIELD_PREP(AMS_CONF1_SEQ_MASK, 0) -#define AMS_CONF1_SEQ_CONTINUOUS FIELD_PREP(AMS_CONF1_SEQ_MASK, 1) -#define AMS_CONF1_SEQ_SINGLE_CHANNEL FIELD_PREP(AMS_CONF1_SEQ_MASK, 2) +#define AMS_CONF1_SEQ_CONTINUOUS FIELD_PREP(AMS_CONF1_SEQ_MASK, 2) +#define AMS_CONF1_SEQ_SINGLE_CHANNEL FIELD_PREP(AMS_CONF1_SEQ_MASK, 3)#define AMS_REG_SEQ0_MASK GENMASK(15, 0)#define AMS_REG_SEQ2_MASK GENMASK(21, 16)
Greg Kroah-Hartman
maintainerPATCH 33/1126 iio: afe: rescale: use s64 for temporary scale calculations
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 51593106b608ae4247cc8da928813347da16d025 upstream.
All four scaling coefficients can take signed values. Make tmp a signed 64-bit integer and switch to div_s64() to preserve signs during 64-bit divisions.
--- drivers/iio/afe/iio-rescale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/afe/iio-rescale.c +4 -4
@@ -39,7 +39,7 @@ static int rescale_read_raw(struct iio_d int *val, int *val2, long mask) { struct rescale *rescale = iio_priv(indio_dev); -unsigned long long tmp; +s64 tmp;int ret;switch (mask) {
@@ -77,10 +77,10 @@ static int rescale_read_raw(struct iio_d *val2 = rescale->denominator;return IIO_VAL_FRACTIONAL ;case IIO_VAL_FRACTIONAL_LOG2 : - tmp = *val *1000000000LL ; -do_div (tmp, rescale->denominator); + tmp = (s64)*val *1000000000LL ; + tmp =div_s64 (tmp, rescale->denominator); tmp *= rescale->numerator; -do_div (tmp,1000000000LL ); + tmp =div_s64 (tmp,1000000000LL ); *val = tmp;return ret;default :
Greg Kroah-Hartman
maintainerPATCH 36/1126 iio: inkern: apply consumer scale on IIO_VAL_INT cases
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 1bca97ff95c732a516ebb68da72814194980e0a5 upstream.
When a consumer calls iio_read_channel_processed() and the channel has an integer scale, the scale channel scale is applied and the processed value is returned as expected.
On the other hand, if the consumer calls iio_convert_raw_to_processed() the scaling factor requested by the consumer is not applied.
This for example causes the consumer to process mV when expecting uV. Make sure to always apply the scaling factor requested by the consumer.
--- drivers/iio/inkern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/inkern.c +1 -1
@@ -616,7 +616,7 @@ static int iio_convert_raw_to_processed_switch (scale_type) {case IIO_VAL_INT : - *processed = raw64 * scale_val; + *processed = raw64 * scale_val * scale;break ;case IIO_VAL_INT_PLUS_MICRO :if (scale_val2 <0 )
Greg Kroah-Hartman
maintainerPATCH 37/1126 iio: inkern: apply consumer scale when no channel scale is available
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 14b457fdde38de594a4bc4bd9075019319d978da upstream.
When a consumer calls iio_read_channel_processed() and no channel scale is available, it's assumed that the scale is one and the raw value is returned as expected.
On the other hand, if the consumer calls iio_convert_raw_to_processed() the scaling factor requested by the consumer is not applied.
This for example causes the consumer to process mV when expecting uV. Make sure to always apply the scaling factor requested by the consumer.
--- drivers/iio/inkern.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/inkern.c +3 -3
@@ -607,10 +607,10 @@ static int iio_convert_raw_to_processed_ IIO_CHAN_INFO_SCALE);if (scale_type <0 ) {/* -* Just pass raw values as processed if no scaling is -* available. +* If no channel scaling is available apply consumer scale to +* raw value and return. */ - *processed = raw; + *processed = raw * scale;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 39/1126 greybus: svc: fix an error handling bug in gb_svc_hello()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 5f8583a3b7552092582a92e7bbd2153319929ad7 upstream.
Cleanup if gb_svc_queue_deferred_request() fails.
--- drivers/greybus/svc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/greybus/svc.c +7 -1
@@ -866,8 +866,14 @@ static int gb_svc_hello(struct gb_operatgb_svc_debugfs_init (svc); -return gb_svc_queue_deferred_request (op); + ret =gb_svc_queue_deferred_request (op); +if (ret) + goto err_remove_debugfs; +return 0 ; + +err_remove_debugfs: +gb_svc_debugfs_exit (svc); err_unregister_device:gb_svc_watchdog_destroy (svc);device_del (&svc->dev);
Greg Kroah-Hartman
maintainerPATCH 42/1126 ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit ee1fee900537b5d9560e9f937402de5ddc8412f3 upstream.
Setting PTRACE_O_SUSPEND_SECCOMP is supposed to be a highly privileged operation because it allows the tracee to completely bypass all seccomp filters on kernels with CONFIG_CHECKPOINT_RESTORE=y. It is only supposed to be settable by a process with global CAP_SYS_ADMIN, and only if that process is not subject to any seccomp filters at all.
However, while these permission checks were done on the PTRACE_SETOPTIONS path, they were missing on the PTRACE_SEIZE path, which also sets user-specified ptrace flags.
Move the permissions checks out into a helper function and let both ptrace_attach() and ptrace_setoptions() call it.
--- kernel/ptrace.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-)
kernel/ptrace.c +32 -15
@@ -371,6 +371,26 @@ bool ptrace_may_access(struct task_strucreturn !err; } +static int check_ptrace_options (unsigned long data) +{ +if (data & ~(unsigned long )PTRACE_O_MASK ) +return -EINVAL ; + +if (unlikely (data &PTRACE_O_SUSPEND_SECCOMP )) { +if (!IS_ENABLED (CONFIG_CHECKPOINT_RESTORE ) || + !IS_ENABLED (CONFIG_SECCOMP )) +return -EINVAL ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +if (seccomp_mode (¤t->seccomp) !=SECCOMP_MODE_DISABLED || + current->ptrace &PT_SUSPEND_SECCOMP ) +return -EPERM ; + } +return 0 ; +} +static int ptrace_attach (struct task_struct *task,long request,unsigned long addr,unsigned long flags)
@@ -382,8 +402,16 @@ static int ptrace_attach(struct task_strif (seize) {if (addr !=0 ) goto out; +/* +* This duplicates the check in check_ptrace_options() because +* ptrace_attach() and ptrace_setoptions() have historically +* used different error codes for unknown ptrace options. +*/ if (flags & ~(unsigned long )PTRACE_O_MASK ) goto out; + retval =check_ptrace_options (flags); +if (retval) +return retval; flags =PT_PTRACED |PT_SEIZED | (flags <<PT_OPT_FLAG_SHIFT ); }else { flags =PT_PTRACED ;
@@ -654,22 +682,11 @@ int ptrace_writedata(struct task_structstatic int ptrace_setoptions (struct task_struct *child,unsigned long data) {unsigned flags; +int ret; -if (data & ~(unsigned long )PTRACE_O_MASK ) -return -EINVAL ; - -if (unlikely (data &PTRACE_O_SUSPEND_SECCOMP )) { -if (!IS_ENABLED (CONFIG_CHECKPOINT_RESTORE ) || - !IS_ENABLED (CONFIG_SECCOMP )) -return -EINVAL ; - -if (!capable (CAP_SYS_ADMIN )) -return -EPERM ; - -if (seccomp_mode (¤t->seccomp) !=SECCOMP_MODE_DISABLED || - current->ptrace &PT_SUSPEND_SECCOMP ) -return -EPERM ; - } + ret =check_ptrace_options (data); +if (ret) +return ret;/* Avoid intermediate state when all opts are cleared */ flags = child->ptrace;
Greg Kroah-Hartman
maintainerPATCH 43/1126 cifs: truncate the inode and mapping when we simulate fcollapse
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
commit 84330d41efb12bc227899e54dbdbe7d9590cb2b7 upstream.
RHBZ:1997367
When we collapse a range in smb3_collapse_range() we must make sure we update the inode size and pagecache accordingly.
If not, both inode size and pagecahce may be stale until it is refreshed.
This can be demonstrated for the inode size by running :
xfs_io -i -f -c "truncate 320k" -c "fcollapse 64k 128k" -c "fiemap -v" \/mnt/testfile
where we can see the result of stale data in the fiemap output. The third line of the output is wrong, all this data should be truncated.
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS 0: [0..127]: hole 128 1: [128..383]: 128..383 256 0x1 2: [384..639]: hole 256
And the correct output, when the inode size has been updated correctly should look like this:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS 0: [0..127]: hole 128 1: [128..383]: 128..383 256 0x1
--- fs/cifs/smb2ops.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
fs/cifs/smb2ops.c +14 -4
@@ -25,6 +25,7 @@#include "smb2glob.h" #include "cifs_ioctl.h" #include "smbdirect.h" +#include "fscache.h" #include "fs_context.h" /* Change credits for different ops and return the total number of credits */
@@ -3887,29 +3888,38 @@ static long smb3_collapse_range(struct f {int rc;unsigned int xid; +struct inode *inode;struct cifsFileInfo *cfile = file->private_data; +struct cifsInodeInfo *cifsi;__le64 eof; xid =get_xid (); -if (off >=i_size_read (file->f_inode) || - off + len >=i_size_read (file->f_inode)) { + inode =d_inode (cfile->dentry); + cifsi =CIFS_I (inode); + +if (off >=i_size_read (inode) || + off + len >=i_size_read (inode)) { rc = -EINVAL ; goto out; } rc =smb2_copychunk_range (xid, cfile, cfile, off + len, -i_size_read (file->f_inode) - off - len, off); +i_size_read (inode) - off - len, off);if (rc <0 ) goto out; - eof =cpu_to_le64 (i_size_read (file->f_inode) - len); + eof =cpu_to_le64 (i_size_read (inode) - len); rc =SMB2_set_eof (xid, tcon, cfile->fid.persistent_fid, cfile->fid.volatile_fid, cfile->pid, &eof);if (rc <0 ) goto out; rc =0 ; + + cifsi->server_eof =i_size_read (inode) - len; +truncate_setsize (inode, cifsi->server_eof); +fscache_resize_cookie (cifs_inode_cookie (inode), cifsi->server_eof); out:free_xid (xid);return rc;
Greg Kroah-Hartman
maintainerPATCH 48/1126 KEYS: asymmetric: properly validate hash_algo and encoding
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 590bfb57b2328951d5833979e7ca1d5fde2e609a upstream.
It is insecure to allow arbitrary hash algorithms and signature encodings to be used with arbitrary signature algorithms. Notably, ECDSA, ECRDSA, and SM2 all sign/verify raw hash values and don't disambiguate between different hash algorithms like RSA PKCS#1 v1.5 padding does. Therefore, they need to be restricted to certain sets of hash algorithms (ideally just one, but in practice small sets are used). Additionally, the encoding is an integral part of modern signature algorithms, and is not supposed to vary.
Therefore, tighten the checks of hash_algo and encoding done by software_key_determine_akcipher().
Also rearrange the parameters to software_key_determine_akcipher() to put the public_key first, as this is the most important parameter and it often determines everything else.
--- crypto/asymmetric_keys/public_key.c | 111 ++++++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 35 deletions(-)
crypto/asymmetric_keys/public_key.c +76 -35
@@ -60,39 +60,83 @@ static void public_key_destroy(void *pay }/* -* Determine the crypto algorithm name. +* Given a public_key, and an encoding and hash_algo to be used for signing +* and/or verification with that key, determine the name of the corresponding +* akcipher algorithm. Also check that encoding and hash_algo are allowed. */ -static -int software_key_determine_akcipher (const char *encoding, -const char *hash_algo, -const struct public_key *pkey, -char alg_name[CRYPTO_MAX_ALG_NAME ]) +static int +software_key_determine_akcipher (const struct public_key *pkey, +const char *encoding,const char *hash_algo, +char alg_name[CRYPTO_MAX_ALG_NAME ]) {int n; -if (strcmp (encoding,"pkcs1" ) ==0 ) { -/* The data wangled by the RSA algorithm is typically padded -* and encoded in some manner, such as EMSA-PKCS1-1_5 [RFC3447 -* sec 8.2]. +if (!encoding) +return -EINVAL ; + +if (strcmp (pkey->pkey_algo,"rsa" ) ==0 ) { +/* +* RSA signatures usually use EMSA-PKCS1-1_5 [RFC3447 sec 8.2]. +*/ +if (strcmp (encoding,"pkcs1" ) ==0 ) { +if (!hash_algo) + n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , +"pkcs1pad(%s)" , + pkey->pkey_algo); +else + n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , +"pkcs1pad(%s,%s)" , + pkey->pkey_algo, hash_algo); +return n >=CRYPTO_MAX_ALG_NAME ? -EINVAL :0 ; + } +if (strcmp (encoding,"raw" ) !=0 ) +return -EINVAL ; +/* +* Raw RSA cannot differentiate between different hash +* algorithms. +*/ +if (hash_algo) +return -EINVAL ; + }else if (strncmp (pkey->pkey_algo,"ecdsa" ,5 ) ==0 ) { +if (strcmp (encoding,"x962" ) !=0 ) +return -EINVAL ; +/* +* ECDSA signatures are taken over a raw hash, so they don't +* differentiate between different hash algorithms. That means +* that the verifier should hard-code a specific hash algorithm. +* Unfortunately, in practice ECDSA is used with multiple SHAs, +* so we have to allow all of them and not just one. */ if (!hash_algo) - n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , -"pkcs1pad(%s)" , - pkey->pkey_algo); -else - n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , -"pkcs1pad(%s,%s)" , - pkey->pkey_algo, hash_algo); -return n >=CRYPTO_MAX_ALG_NAME ? -EINVAL :0 ; - } - -if (strcmp (encoding,"raw" ) ==0 || -strcmp (encoding,"x962" ) ==0 ) { -strcpy (alg_name, pkey->pkey_algo); -return 0 ; +return -EINVAL ; +if (strcmp (hash_algo,"sha1" ) !=0 && +strcmp (hash_algo,"sha224" ) !=0 && +strcmp (hash_algo,"sha256" ) !=0 && +strcmp (hash_algo,"sha384" ) !=0 && +strcmp (hash_algo,"sha512" ) !=0 ) +return -EINVAL ; + }else if (strcmp (pkey->pkey_algo,"sm2" ) ==0 ) { +if (strcmp (encoding,"raw" ) !=0 ) +return -EINVAL ; +if (!hash_algo) +return -EINVAL ; +if (strcmp (hash_algo,"sm3" ) !=0 ) +return -EINVAL ; + }else if (strcmp (pkey->pkey_algo,"ecrdsa" ) ==0 ) { +if (strcmp (encoding,"raw" ) !=0 ) +return -EINVAL ; +if (!hash_algo) +return -EINVAL ; +if (strcmp (hash_algo,"streebog256" ) !=0 && +strcmp (hash_algo,"streebog512" ) !=0 ) +return -EINVAL ; + }else { +/* Unknown public key algorithm */ +return -ENOPKG ; } - -return -ENOPKG ; +if (strscpy (alg_name, pkey->pkey_algo,CRYPTO_MAX_ALG_NAME ) <0 ) +return -EINVAL ; +return 0 ; }static u8 *pkey_pack_u32 (u8 *dst,u32 val)
@@ -113,9 +157,8 @@ static int software_key_query(const struu8 *key, *ptr;int ret, len; - ret =software_key_determine_akcipher (params->encoding, - params->hash_algo, - pkey, alg_name); + ret =software_key_determine_akcipher (pkey, params->encoding, + params->hash_algo, alg_name);if (ret <0 )return ret;
@@ -179,9 +222,8 @@ static int software_key_eds_op(struct kepr_devel ("==>%s()\n" , __func__); - ret =software_key_determine_akcipher (params->encoding, - params->hash_algo, - pkey, alg_name); + ret =software_key_determine_akcipher (pkey, params->encoding, + params->hash_algo, alg_name);if (ret <0 )return ret;
@@ -340,9 +382,8 @@ int public_key_verify_signature(const streturn -EKEYREJECTED ; } - ret =software_key_determine_akcipher (sig->encoding, - sig->hash_algo, - pkey, alg_name); + ret =software_key_determine_akcipher (pkey, sig->encoding, + sig->hash_algo, alg_name);if (ret <0 )return ret;
Greg Kroah-Hartman
maintainerPATCH 49/1126 Documentation: add link to stable release candidate tree
In reply to Greg Kroah-HartmanFrom: Bagas Sanjaya <[email protected]>
commit 587d39b260c4d090166314d64be70b1f6a26b0b5 upstream.
There is also stable release candidate tree. Mention it, however with a warning that the tree is for testing purposes.
--- Documentation/process/stable-kernel-rules.rst | 9 +++++++++ 1 file changed, 9 insertions(+)
Documentation/process/stable-kernel-rules.rst +9 -0
@@ -170,6 +170,15 @@ Trees https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + - The release candidate of all stable kernel versions can be found at: + + https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/ + + .. warning:: + The -stable-rc tree is a snapshot in time of the stable-queue tree and + will change frequently, hence will be rebased often. It should only be + used for testing purposes (e.g. to be consumed by CI systems). + Review committee ----------------
Greg Kroah-Hartman
maintainerPATCH 46/1126 KEYS: fix length validation in keyctl_pkey_params_get_2()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit c51abd96837f600d8fd940b6ab8e2da578575504 upstream.
In many cases, keyctl_pkey_params_get_2() is validating the user buffer lengths against the wrong algorithm properties. Fix it to check against the correct properties.
Probably this wasn't noticed before because for all asymmetric keys of the "public_key" subtype, max_data_size == max_sig_size == max_enc_size == max_dec_size. However, this isn't necessarily true for the "asym_tpm" subtype (it should be, but it's not strictly validated). Of course, future key types could have different values as well.
--- security/keys/keyctl_pkey.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
security/keys/keyctl_pkey.c +11 -3
@@ -135,15 +135,23 @@ static int keyctl_pkey_params_get_2(consswitch (op) {case KEYCTL_PKEY_ENCRYPT : +if (uparams.in_len > info.max_dec_size || + uparams.out_len > info.max_enc_size) +return -EINVAL ; +break ;case KEYCTL_PKEY_DECRYPT :if (uparams.in_len > info.max_enc_size || uparams.out_len > info.max_dec_size)return -EINVAL ;break ;case KEYCTL_PKEY_SIGN : +if (uparams.in_len > info.max_data_size || + uparams.out_len > info.max_sig_size) +return -EINVAL ; +break ;case KEYCTL_PKEY_VERIFY : -if (uparams.in_len > info.max_sig_size || - uparams.out_len > info.max_data_size) +if (uparams.in_len > info.max_data_size || + uparams.in2_len > info.max_sig_size)return -EINVAL ;break ;default :
@@ -151,7 +159,7 @@ static int keyctl_pkey_params_get_2(cons } params->in_len = uparams.in_len; - params->out_len = uparams.out_len; + params->out_len = uparams.out_len;/* Note: same as in2_len */ return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 47/1126 KEYS: asymmetric: enforce that sig algo matches key algo
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 2abc9c246e0548e52985b10440c9ea3e9f65f793 upstream.
Most callers of public_key_verify_signature(), including most indirect callers via verify_signature() as well as pkcs7_verify_sig_chain(), don't check that public_key_signature::pkey_algo matches public_key::pkey_algo. These should always match. However, a malicious signature could intentionally declare an unintended algorithm. It is essential that such signatures be rejected outright, or that the algorithm of the *key* be used -- not the algorithm of the signature as that would allow attackers to choose the algorithm used.
Currently, public_key_verify_signature() correctly uses the key's algorithm when deciding which akcipher to allocate. That's good. However, it uses the signature's algorithm when deciding whether to do the first step of SM2, which is incorrect. Also, v4.19 and older kernels used the signature's algorithm for the entire process.
Prevent such errors by making public_key_verify_signature() enforce that the signature's algorithm (if given) matches the key's algorithm.
Also remove two checks of this done by callers, which are now redundant.
--- crypto/asymmetric_keys/pkcs7_verify.c | 6 ------ crypto/asymmetric_keys/public_key.c | 15 +++++++++++++++ crypto/asymmetric_keys/x509_public_key.c | 6 ------ 3 files changed, 15 insertions(+), 12 deletions(-)
crypto/asymmetric_keys/pkcs7_verify.c +0 -6
@@ -174,12 +174,6 @@ static int pkcs7_find_key(struct pkcs7_mpr_devel ("Sig %u: Found cert serial match X.509[%u]\n" , sinfo->index, certix); -if (strcmp (x509->pub->pkey_algo, sinfo->sig->pkey_algo) !=0 ) { -pr_warn ("Sig %u: X.509 algo and PKCS#7 sig algo don't match\n" , - sinfo->index); -continue ; - } - sinfo->signer = x509;return 0 ; }
crypto/asymmetric_keys/public_key.c +15 -0
@@ -325,6 +325,21 @@ int public_key_verify_signature(const stBUG_ON (!sig);BUG_ON (!sig->s); +/* +* If the signature specifies a public key algorithm, it *must* match +* the key's actual public key algorithm. +* +* Small exception: ECDSA signatures don't specify the curve, but ECDSA +* keys do. So the strings can mismatch slightly in that case: +* "ecdsa-nist-*" for the key, but "ecdsa" for the signature. +*/ +if (sig->pkey_algo) { +if (strcmp (pkey->pkey_algo, sig->pkey_algo) !=0 && + (strncmp (pkey->pkey_algo,"ecdsa-" ,6 ) !=0 || +strcmp (sig->pkey_algo,"ecdsa" ) !=0 )) +return -EKEYREJECTED ; + } + ret =software_key_determine_akcipher (sig->encoding, sig->hash_algo, pkey, alg_name);
crypto/asymmetric_keys/x509_public_key.c +0 -6
@@ -128,12 +128,6 @@ int x509_check_for_self_signed(struct x5 goto out; } - ret = -EKEYREJECTED ; -if (strcmp (cert->pub->pkey_algo, cert->sig->pkey_algo) !=0 && - (strncmp (cert->pub->pkey_algo,"ecdsa-" ,6 ) !=0 || -strcmp (cert->sig->pkey_algo,"ecdsa" ) !=0 )) - goto out; - ret =public_key_verify_signature (cert->pub, cert->sig);if (ret <0 ) {if (ret == -ENOPKG ) {
Greg Kroah-Hartman
maintainerPATCH 45/1126 cifs: we do not need a spinlock around the tree access during umount
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
commit 9a14b65d590105d393b63f5320e1594edda7c672 upstream.
Remove the spinlock around the tree traversal as we are calling possibly sleeping functions.
We do not need a spinlock here as there will be no modifications to this tree at this point.
This prevents warnings like this to occur in dmesg:
[ 653.774996] BUG: sleeping function called from invalid context at kernel/loc\ king/mutex.c:280 [ 653.775088] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1827, nam\ e: umount [ 653.775152] preempt_count: 1, expected: 0 [ 653.775191] CPU: 0 PID: 1827 Comm: umount Tainted: G W OE 5.17.0\ -rc7-00006-g4eb628dd74df #135 [ 653.775195] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-\ 1.fc33 04/01/2014 [ 653.775197] Call Trace: [ 653.775199] <TASK> [ 653.775202] dump_stack_lvl+0x34/0x44 [ 653.775209] __might_resched.cold+0x13f/0x172 [ 653.775213] mutex_lock+0x75/0xf0 [ 653.775217] ? __mutex_lock_slowpath+0x10/0x10 [ 653.775220] ? _raw_write_lock_irq+0xd0/0xd0 [ 653.775224] ? dput+0x6b/0x360 [ 653.775228] cifs_kill_sb+0xff/0x1d0 [cifs] [ 653.775285] deactivate_locked_super+0x85/0x130 [ 653.775289] cleanup_mnt+0x32c/0x4d0 [ 653.775292] ? path_umount+0x228/0x380 [ 653.775296] task_work_run+0xd8/0x180 [ 653.775301] exit_to_user_mode_loop+0x152/0x160 [ 653.775306] exit_to_user_mode_prepare+0x89/0xd0 [ 653.775315] syscall_exit_to_user_mode+0x12/0x30 [ 653.775322] do_syscall_64+0x48/0x90 [ 653.775326] entry_SYSCALL_64_after_hwframe+0x44/0xae
--- fs/cifs/cifsfs.c | 2 -- 1 file changed, 2 deletions(-)
fs/cifs/cifsfs.c +0 -2
@@ -266,7 +266,6 @@ static void cifs_kill_sb(struct super_bldput (cifs_sb->root); cifs_sb->root =NULL ; } -spin_lock (&cifs_sb->tlink_tree_lock); node =rb_first (root);while (node !=NULL ) { tlink = rb_entry(node, struct tcon_link, tl_rbnode);
@@ -280,7 +279,6 @@ static void cifs_kill_sb(struct super_blmutex_unlock (&cfid->fid_mutex); node =rb_next (node); } -spin_unlock (&cifs_sb->tlink_tree_lock);kill_anon_super (sb);cifs_umount (cifs_sb);
Greg Kroah-Hartman
maintainerPATCH 44/1126 cifs: fix handlecache and multiuser
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
commit 47178c7722ac528ea08aa82c3ef9ffa178962d7a upstream.
In multiuser each individual user has their own tcon structure for the share and thus their own handle for a cached directory.
When we umount such a share we much make sure to release the pinned down dentry for each such tcon and not just the master tcon.
Otherwise we will get nasty warnings on umount that dentries are still in use:
[ 3459.590047] BUG: Dentry 00000000115c6f41{i=12000000019d95,n=/} still in use\
(2) [unmount of cifs cifs]
...
[ 3459.590492] Call Trace:
[ 3459.590500] d_walk+0x61/0x2a0
[ 3459.590518] ? shrink_lock_dentry.part.0+0xe0/0xe0
[ 3459.590526] shrink_dcache_for_umount+0x49/0x110
[ 3459.590535] generic_shutdown_super+0x1a/0x110
[ 3459.590542] kill_anon_super+0x14/0x30
[ 3459.590549] cifs_kill_sb+0xf5/0x104 [cifs]
[ 3459.590773] deactivate_locked_super+0x36/0xa0
[ 3459.590782] cleanup_mnt+0x131/0x190
[ 3459.590789] task_work_run+0x5c/0x90
[ 3459.590798] exit_to_user_mode_loop+0x151/0x160
[ 3459.590809] exit_to_user_mode_prepare+0x83/0xd0
[ 3459.590818] syscall_exit_to_user_mode+0x12/0x30
[ 3459.590828] do_syscall_64+0x48/0x90
[ 3459.590833] entry_SYSCALL_64_after_hwframe+0x44/0xae--- fs/cifs/cifsfs.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
fs/cifs/cifsfs.c +10 -3
@@ -254,6 +254,9 @@ static void cifs_kill_sb(struct super_blstruct cifs_sb_info *cifs_sb =CIFS_SB (sb);struct cifs_tcon *tcon;struct cached_fid *cfid; +struct rb_root *root = &cifs_sb->tlink_tree; +struct rb_node *node; +struct tcon_link *tlink;/* * We ned to release all dentries for the cached directories
@@ -263,17 +266,21 @@ static void cifs_kill_sb(struct super_bldput (cifs_sb->root); cifs_sb->root =NULL ; } - tcon =cifs_sb_master_tcon (cifs_sb); -if (tcon) { +spin_lock (&cifs_sb->tlink_tree_lock); + node =rb_first (root); +while (node !=NULL ) { + tlink = rb_entry(node, struct tcon_link, tl_rbnode); + tcon =tlink_tcon (tlink); cfid = &tcon->crfid;mutex_lock (&cfid->fid_mutex);if (cfid->dentry) { -dput (cfid->dentry); cfid->dentry =NULL ; }mutex_unlock (&cfid->fid_mutex); + node =rb_next (node); } +spin_unlock (&cifs_sb->tlink_tree_lock);kill_anon_super (sb);cifs_umount (cifs_sb);
Greg Kroah-Hartman
maintainerPATCH 15/1126 xhci: fix garbage USBSTS being logged in some cases
In reply to Greg Kroah-HartmanFrom: Anssi Hannula <[email protected]>
commit 3105bc977d7cbf2edc35e24cc7e009686f6e4a56 upstream.
xhci_decode_usbsts() is expected to return a zero-terminated string by its only caller, xhci_stop_endpoint_command_watchdog(), which directly logs the return value:
xhci_warn(xhci, "USBSTS:%s\n", xhci_decode_usbsts(str, usbsts));
However, if no recognized bits are set in usbsts, the function will return without having called any sprintf() and therefore return an untouched non-zero-terminated caller-provided buffer, causing garbage to be output to log.
Fix that by always including the raw value in the output.
Note that before commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing") the result effect in the failure case was different as a static buffer was used here, but the code still worked incorrectly.
--- drivers/usb/host/xhci.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.h +4 -1
@@ -2624,8 +2624,11 @@ static inline const char *xhci_decode_us {int ret =0 ; + ret =sprintf (str," 0x%08x" , usbsts); +if (usbsts == ~(u32 )0 ) -return " 0xffffffff" ; +return str; +if (usbsts &STS_HALT ) ret +=sprintf (str + ret," HCHalted" );if (usbsts &STS_FATAL )
Greg Kroah-Hartman
maintainerPATCH 41/1126 clk: uniphier: Fix fixed-rate initialization
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
commit ca85a66710a8a1f6b0719397225c3e9ee0abb692 upstream.
Fixed-rate clocks in UniPhier don't have any parent clocks, however, initial data "init.flags" isn't initialized, so it might be determined that there is a parent clock for fixed-rate clock.
This sets init.flags to zero as initialization.
--- drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/uniphier/clk-uniphier-fixed-rate.c +1 -0
@@ -24,6 +24,7 @@ struct clk_hw *uniphier_clk_register_fix init.name = name; init.ops = &clk_fixed_rate_ops; + init.flags =0 ; init.parent_names =NULL ; init.num_parents =0 ;
Greg Kroah-Hartman
maintainerPATCH 40/1126 clk: rockchip: re-add rational best approximation algorithm to the fractional divider
In reply to Greg Kroah-HartmanFrom: Quentin Schulz <[email protected]>
commit 10b74af310735860510a533433b1d3ab2e05a138 upstream.
In commit 4e7cf74fa3b2 ("clk: fractional-divider: Export approximation algorithm to the CCF users"), the code handling the rational best approximation algorithm was replaced by a call to the core clk_fractional_divider_general_approximation function which did the same thing back then.
However, in commit 82f53f9ee577 ("clk: fractional-divider: Introduce POWER_OF_TWO_PS flag"), this common code was made conditional on CLK_FRAC_DIVIDER_POWER_OF_TWO_PS flag which was not added back to the rockchip clock driver.
This broke the ltk050h3146w-a2 MIPI DSI display present on a PX30-based downstream board.
Let's add the flag to the fractional divider flags so that the original and intended behavior is brought back to the rockchip clock drivers.
--- drivers/clk/rockchip/clk.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/rockchip/clk.c +3 -0
@@ -180,6 +180,7 @@ static void rockchip_fractional_approxim unsigned long rate, unsigned long *parent_rate, unsigned long *m, unsigned long *n) { + struct clk_fractional_divider *fd = to_clk_fd(hw);unsigned long p_rate, p_parent_rate;struct clk_hw *p_parent;
@@ -190,6 +191,8 @@ static void rockchip_fractional_approxim *parent_rate = p_parent_rate; } + fd->flags |=CLK_FRAC_DIVIDER_POWER_OF_TWO_PS ; +clk_fractional_divider_general_approximation (hw, rate, parent_rate, m, n); }
Greg Kroah-Hartman
maintainerPATCH 50/1126 Documentation: update stable tree link
In reply to Greg Kroah-HartmanFrom: Bagas Sanjaya <[email protected]>
commit 555d44932c67e617d89bc13c81c7efac5b51fcfa upstream.
The link to stable tree is redirected to
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git. Update accordingly.
--- Documentation/process/stable-kernel-rules.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/process/stable-kernel-rules.rst +1 -1
@@ -168,7 +168,7 @@ Trees - The finalized and tagged releases of all stable kernels can be found in separate branches per version at: - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git - The release candidate of all stable kernel versions can be found at:
Greg Kroah-Hartman
maintainerPATCH 51/1126 firmware: stratix10-svc: add missing callback parameter on RSU
In reply to Greg Kroah-HartmanFrom: Ang Tien Sung <[email protected]>
commit b850b7a8b369322adf699ef48ceff4d902525c8c upstream.
Fix a bug whereby, the return response of parameter a1 from an SMC call is not properly set to the callback data during an INTEL_SIP_SMC_RSU_ERROR command.
--- drivers/firmware/stratix10-svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/stratix10-svc.c +1 -1
@@ -477,7 +477,7 @@ static int svc_normal_to_secure_thread(vcase INTEL_SIP_SMC_RSU_ERROR :pr_err ("%s: STATUS_ERROR\n" , __func__); cbdata->status =BIT (SVC_STATUS_ERROR ); - cbdata->kaddr1 =NULL ; + cbdata->kaddr1 = &res.a1; cbdata->kaddr2 =NULL ; cbdata->kaddr3 =NULL ; pdata->chan->scl->receive_cb (pdata->chan->scl, cbdata);
Greg Kroah-Hartman
maintainerPATCH 38/1126 iio: inkern: make a best effort on offset calculation
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit ca85123354e1a65a22170286387b4791997fe864 upstream.
iio_convert_raw_to_processed_unlocked() assumes the offset is an integer. Make a best effort to get a valid offset value for fractional cases without breaking implicit truncations.
--- drivers/iio/inkern.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
drivers/iio/inkern.c +27 -5
@@ -595,13 +595,35 @@ EXPORT_SYMBOL_GPL(iio_read_channel_averastatic int iio_convert_raw_to_processed_unlocked (struct iio_channel *chan,int raw,int *processed,unsigned int scale) { -int scale_type, scale_val, scale_val2, offset; +int scale_type, scale_val, scale_val2; +int offset_type, offset_val, offset_val2;s64 raw64 = raw; -int ret; - ret =iio_channel_read (chan, &offset,NULL ,IIO_CHAN_INFO_OFFSET ); -if (ret >=0 ) - raw64 += offset; + offset_type =iio_channel_read (chan, &offset_val, &offset_val2, +IIO_CHAN_INFO_OFFSET ); +if (offset_type >=0 ) { +switch (offset_type) { +case IIO_VAL_INT : +break ; +case IIO_VAL_INT_PLUS_MICRO : +case IIO_VAL_INT_PLUS_NANO : +/* +* Both IIO_VAL_INT_PLUS_MICRO and IIO_VAL_INT_PLUS_NANO +* implicitely truncate the offset to it's integer form. +*/ +break ; +case IIO_VAL_FRACTIONAL : + offset_val /= offset_val2; +break ; +case IIO_VAL_FRACTIONAL_LOG2 : + offset_val >>= offset_val2; +break ; +default : +return -EINVAL ; + } + + raw64 += offset_val; + } scale_type =iio_channel_read (chan, &scale_val, &scale_val2,IIO_CHAN_INFO_SCALE );
Greg Kroah-Hartman
maintainerPATCH 16/1126 xhci: fix runtime PM imbalance in USB2 resume
In reply to Greg Kroah-HartmanFrom: Henry Lin <[email protected]>
commit 70c05e4cf63054cd755ca66c1819327b22cb085f upstream.
A race between system resume and device-initiated resume may result in runtime PM imbalance on USB2 root hub. If a device-initiated resume starts and system resume xhci_bus_resume() directs U0 before hub driver sees the resuming device in RESUME state, device-initiated resume will not be finished in xhci_handle_usb2_port_link_resume(). In this case, usb_hcd_end_port_resume() call is missing.
This changes calls usb_hcd_end_port_resume() if resuming device reaches U0 to keep runtime PM balance.
--- drivers/usb/host/xhci-hub.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-hub.c +3 -0
@@ -1088,6 +1088,9 @@ static void xhci_get_usb2_port_status(stif (link_state ==XDEV_U2 ) *status |=USB_PORT_STAT_L1 ;if (link_state ==XDEV_U0 ) { +if (bus_state->resume_done[portnum]) +usb_hcd_end_port_resume (&port->rhub->hcd->self, + portnum); bus_state->resume_done[portnum] =0 ;clear_bit (portnum, &bus_state->resuming_ports);if (bus_state->suspended_ports & (1 << portnum)) {
Greg Kroah-Hartman
maintainerPATCH 52/1126 firmware: sysfb: fix platform-device leak in error path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 202c08914ba50dd324e42d5ad99535a89f242560 upstream.
Make sure to free the platform device also in the unlikely event that registration fails.
--- drivers/firmware/sysfb_simplefb.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/firmware/sysfb_simplefb.c +14 -9
@@ -113,16 +113,21 @@ __init int sysfb_create_simplefb(const ssysfb_apply_efi_quirks (pd); ret =platform_device_add_resources (pd, &res,1 ); -if (ret) { -platform_device_put (pd); -return ret; - } +if (ret) + goto err_put_device; ret =platform_device_add_data (pd, mode,sizeof (*mode)); -if (ret) { -platform_device_put (pd); -return ret; - } +if (ret) + goto err_put_device; -return platform_device_add (pd); + ret =platform_device_add (pd); +if (ret) + goto err_put_device; + +return 0 ; + +err_put_device: +platform_device_put (pd); + +return ret; }
Greg Kroah-Hartman
maintainerPATCH 53/1126 HID: intel-ish-hid: Use dma_alloc_coherent for firmware update
In reply to Greg Kroah-HartmanFrom: Gwendal Grignou <[email protected]>
commit f97ec5d75e9261a5da78dc28a8955b7cc0c4468b upstream.
Allocating memory with kmalloc and GPF_DMA32 is not allowed, the allocator will ignore the attribute.
Instead, use dma_alloc_coherent() API as we allocate a small amount of memory to transfer firmware fragment to the ISH.
On Arcada chromebook, after the patch the warning:
"Unexpected gfp: 0x4 (GFP_DMA32). Fixing up to gfp: 0xcc0 (GFP_KERNEL). Fix your code!" is gone. The ISH firmware is loaded properly and we can interact with
the ISH:
Quoted 1 line
ectool --name
cros_ishversion
...
Build info: arcada_ish_v2.0.3661+3c1a1c1ae0 2022-02-08 05:37:47 @localhost Tool version: v2.0.12300-900b03ec7f 2022-02-08 10:01:48 @localhost
--- drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 29 ++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-)
drivers/hid/intel-ish-hid/ishtp-fw-loader.c +3 -26
@@ -661,21 +661,12 @@ static int ish_fw_xfer_direct_dma(struct*/ payload_max_size &= ~(L1_CACHE_BYTES -1 ); - dma_buf =kmalloc (payload_max_size,GFP_KERNEL |GFP_DMA32 ); + dma_buf =dma_alloc_coherent (devc, payload_max_size, &dma_buf_phy,GFP_KERNEL );if (!dma_buf) { client_data->flag_retry = true;return -ENOMEM ; } - dma_buf_phy =dma_map_single (devc, dma_buf, payload_max_size, -DMA_TO_DEVICE ); -if (dma_mapping_error (devc, dma_buf_phy)) { -dev_err (cl_data_to_dev (client_data),"DMA map failed\n" ); - client_data->flag_retry = true; - rv = -ENOMEM ; - goto end_err_dma_buf_release; - } - ldr_xfer_dma_frag.fragment.hdr.command =LOADER_CMD_XFER_FRAGMENT ; ldr_xfer_dma_frag.fragment.xfer_mode =LOADER_XFER_MODE_DIRECT_DMA ; ldr_xfer_dma_frag.ddr_phys_addr = (u64 )dma_buf_phy;
@@ -695,14 +686,7 @@ static int ish_fw_xfer_direct_dma(struct ldr_xfer_dma_frag.fragment.size = fragment_size;memcpy (dma_buf, &fw->data[fragment_offset], fragment_size); -dma_sync_single_for_device (devc, dma_buf_phy, - payload_max_size, -DMA_TO_DEVICE ); - -/* -* Flush cache here because the dma_sync_single_for_device() -* does not do for x86. -*/ +/* Flush cache to be sure the data is in main memory. */ clflush_cache_range (dma_buf, payload_max_size); dev_dbg(cl_data_to_dev(client_data),
@@ -725,15 +709,8 @@ static int ish_fw_xfer_direct_dma(struct fragment_offset += fragment_size; } -dma_unmap_single (devc, dma_buf_phy, payload_max_size,DMA_TO_DEVICE ); -kfree (dma_buf); -return 0 ; - end_err_resp_buf_release: -/* Free ISH buffer if not done already, in error case */ -dma_unmap_single (devc, dma_buf_phy, payload_max_size,DMA_TO_DEVICE ); -end_err_dma_buf_release: -kfree (dma_buf); +dma_free_coherent (devc, payload_max_size, dma_buf, dma_buf_phy);return rv; }
Greg Kroah-Hartman
maintainerPATCH 17/1126 xhci: make xhci_handshake timeout for xhci_reset() adjustable
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 14073ce951b5919da450022c050772902f24f054 upstream.
xhci_reset() timeout was increased from 250ms to 10 seconds in order to give Renesas 720201 xHC enough time to get ready in probe.
xhci_reset() is called with interrupts disabled in other places, and waiting for 10 seconds there is not acceptable.
Add a timeout parameter to xhci_reset(), and adjust it back to 250ms when called from xhci_stop() or xhci_shutdown() where interrupts are disabled, and successful reset isn't that critical.
This solves issues when deactivating host mode on platforms like SM8450.
For now don't change the timeout if xHC is reset in xhci_resume(). No issues are reported for it, and we need the reset to succeed. Locking around that reset needs to be revisited later.
Additionally change the signed integer timeout parameter in xhci_handshake() to a u64 to match the timeout value we pass to readl_poll_timeout_atomic()
--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-mem.c | 2 +- drivers/usb/host/xhci.c | 20 +++++++++----------- drivers/usb/host/xhci.h | 7 +++++-- 4 files changed, 16 insertions(+), 15 deletions(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -762,7 +762,7 @@ static int xhci_exit_test_mode(struct xh }pm_runtime_allow (xhci_to_hcd (xhci)->self.controller); xhci->test_mode =0 ; -return xhci_reset (xhci); +return xhci_reset (xhci,XHCI_RESET_SHORT_USEC ); } void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
drivers/usb/host/xhci-mem.c +1 -1
@@ -2583,7 +2583,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, fail:xhci_halt (xhci); -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );xhci_mem_cleanup (xhci);return -ENOMEM ; }
drivers/usb/host/xhci.c +9 -11
@@ -65,7 +65,7 @@ static bool td_on_ring(struct xhci_td *t* handshake done). There are two failure modes: "usec" have passed (major * hardware flakeout), or the register reads as all-ones (hardware removed). */ -int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,int usec) +int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,u64 timeout_us) {u32 result;int ret;
@@ -73,7 +73,7 @@ int xhci_handshake(void __iomem *ptr, u3 ret =readl_poll_timeout_atomic (ptr, result, (result & mask) == done || result ==U32_MAX , -1 , usec); +1 , timeout_us);if (result ==U32_MAX )/* card removed */ return -ENODEV ;
@@ -162,7 +162,7 @@ int xhci_start(struct xhci_hcd *xhci)* Transactions will be terminated immediately, and operational registers * will be set to their defaults. */ -int xhci_reset (struct xhci_hcd *xhci) +int xhci_reset (struct xhci_hcd *xhci,u64 timeout_us) {u32 command;u32 state;
@@ -195,8 +195,7 @@ int xhci_reset(struct xhci_hcd *xhci)if (xhci->quirks &XHCI_INTEL_HOST )udelay (1000 ); - ret =xhci_handshake (&xhci->op_regs->command, -CMD_RESET ,0 ,10 *1000 *1000 ); + ret =xhci_handshake (&xhci->op_regs->command,CMD_RESET ,0 , timeout_us);if (ret)return ret;
@@ -209,8 +208,7 @@ int xhci_reset(struct xhci_hcd *xhci)* xHCI cannot write to any doorbells or operational registers other * than status until the "Controller Not Ready" flag is cleared. */ - ret =xhci_handshake (&xhci->op_regs->status, -STS_CNR ,0 ,10 *1000 *1000 ); + ret =xhci_handshake (&xhci->op_regs->status,STS_CNR ,0 , timeout_us); xhci->usb2_rhub.bus_state.port_c_suspend =0 ; xhci->usb2_rhub.bus_state.suspended_ports =0 ;
@@ -731,7 +729,7 @@ static void xhci_stop(struct usb_hcd *hc xhci->xhc_state |=XHCI_STATE_HALTED ; xhci->cmd_ring_state =CMD_RING_STATE_STOPPED ;xhci_halt (xhci); -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );spin_unlock_irq (&xhci->lock);xhci_cleanup_msix (xhci);
@@ -784,7 +782,7 @@ void xhci_shutdown(struct usb_hcd *hcd)xhci_halt (xhci);/* Workaround for spurious wakeups at shutdown with HSW */ if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );spin_unlock_irq (&xhci->lock);xhci_cleanup_msix (xhci);
@@ -1170,7 +1168,7 @@ int xhci_resume(struct xhci_hcd *xhci, bxhci_dbg (xhci,"Stop HCD\n" );xhci_halt (xhci);xhci_zero_64b_regs (xhci); - retval =xhci_reset (xhci); + retval =xhci_reset (xhci,XHCI_RESET_LONG_USEC );spin_unlock_irq (&xhci->lock);if (retval)return retval;
@@ -5316,7 +5314,7 @@ int xhci_gen_setup(struct usb_hcd *hcd,xhci_dbg (xhci,"Resetting HCD\n" );/* Reset the internal HC memory state and registers. */ - retval =xhci_reset (xhci); + retval =xhci_reset (xhci,XHCI_RESET_LONG_USEC );if (retval)return retval;xhci_dbg (xhci,"Reset complete\n" );
drivers/usb/host/xhci.h +5 -2
@@ -229,6 +229,9 @@ struct xhci_op_regs {#define CMD_ETE (1 << 14)/* bits 15:31 are reserved (and should be preserved on writes). */ +#define XHCI_RESET_LONG_USEC (10 * 1000 * 1000) +#define XHCI_RESET_SHORT_USEC (250 * 1000) +/* IMAN - Interrupt Management Register */ #define IMAN_IE (1 << 1)#define IMAN_IP (1 << 0)
@@ -2083,11 +2086,11 @@ void xhci_free_container_ctx(struct xhci/* xHCI host controller glue */ typedef void (*xhci_get_quirks_t )(struct device *,struct xhci_hcd *); -int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,int usec); +int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,u64 timeout_us);void xhci_quiesce (struct xhci_hcd *xhci);int xhci_halt (struct xhci_hcd *xhci);int xhci_start (struct xhci_hcd *xhci); -int xhci_reset (struct xhci_hcd *xhci); +int xhci_reset (struct xhci_hcd *xhci,u64 timeout_us);int xhci_run (struct usb_hcd *hcd);int xhci_gen_setup (struct usb_hcd *hcd,xhci_get_quirks_t get_quirks);void xhci_shutdown (struct usb_hcd *hcd);
Greg Kroah-Hartman
maintainerPATCH 18/1126 xhci: fix uninitialized string returned by xhci_decode_ctrl_ctx()
In reply to Greg Kroah-HartmanFrom: Anssi Hannula <[email protected]>
commit 05519b8589a679edb8fa781259893d20bece04ad upstream.
xhci_decode_ctrl_ctx() returns the untouched buffer as-is if both "drop" and "add" parameters are zero.
Fix the function to return an empty string in that case.
It was not immediately clear from the possible call chains whether this issue is currently actually triggerable or not.
Note that before commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing") the result effect in the failure case was different as a static buffer was used here, but the code still worked incorrectly.
commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing")
--- drivers/usb/host/xhci.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/xhci.h +2 -0
@@ -2470,6 +2470,8 @@ static inline const char *xhci_decode_ctunsigned int bit;int ret =0 ; + str[0 ] ='\0' ; +if (drop) { ret =sprintf (str,"Drop:" );for_each_set_bit (bit, &drop,32 )
Greg Kroah-Hartman
maintainerPATCH 19/1126 mei: me: disable driver on the ign firmware
In reply to Greg Kroah-HartmanFrom: Alexander Usyskin <[email protected]>
commit ccdf6f806fbf559f7c29ed9302a7c1b4da7fd37f upstream.
Add a quirk to disable MEI interface on Intel PCH Ignition (IGN) as the IGN firmware doesn't support the protocol.
--- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/hw-me.c | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)
drivers/misc/mei/hw-me-regs.h +1 -0
@@ -120,6 +120,7 @@#define PCI_CFG_HFS_2 0x48#define PCI_CFG_HFS_3 0x60# define PCI_CFG_HFS_3_FW_SKU_MSK 0x00000070 +# define PCI_CFG_HFS_3_FW_SKU_IGN 0x00000000# define PCI_CFG_HFS_3_FW_SKU_SPS 0x00000060#define PCI_CFG_HFS_4 0x64#define PCI_CFG_HFS_5 0x68
drivers/misc/mei/hw-me.c +12 -11
@@ -1405,16 +1405,16 @@ static bool mei_me_fw_type_sps_4(const s .quirk_probe = mei_me_fw_type_sps_4/** -* mei_me_fw_type_sps() - check for sps sku +* mei_me_fw_type_sps_ign() - check for sps or ign sku * -* Read ME FW Status register to check for SPS Firmware. -* The SPS FW is only signaled in pci function 0 +* Read ME FW Status register to check for SPS or IGN Firmware. +* The SPS/IGN FW is only signaled in pci function 0 * * @pdev: pci device * -* Return: true in case of SPS firmware +* Return: true in case of SPS/IGN firmware */ -static bool mei_me_fw_type_sps (const struct pci_dev *pdev) +static bool mei_me_fw_type_sps_ign (const struct pci_dev *pdev) {u32 reg;u32 fw_type;
@@ -1427,14 +1427,15 @@ static bool mei_me_fw_type_sps(const strdev_dbg (&pdev->dev,"fw type is %d\n" , fw_type); -return fw_type ==PCI_CFG_HFS_3_FW_SKU_SPS ; +return fw_type ==PCI_CFG_HFS_3_FW_SKU_IGN || + fw_type ==PCI_CFG_HFS_3_FW_SKU_SPS ; }#define MEI_CFG_KIND_ITOUCH \ .kind = "itouch" -#define MEI_CFG_FW_SPS \ - .quirk_probe = mei_me_fw_type_sps +#define MEI_CFG_FW_SPS_IGN \ + .quirk_probe = mei_me_fw_type_sps_ign#define MEI_CFG_FW_VER_SUPP \ .fw_ver_supported = 1
@@ -1535,7 +1536,7 @@ static const struct mei_cfg mei_me_pch12MEI_CFG_PCH8_HFS ,MEI_CFG_FW_VER_SUPP ,MEI_CFG_DMA_128 , - MEI_CFG_FW_SPS, + MEI_CFG_FW_SPS_IGN, };/* Cannon Lake itouch with quirk for SPS 5.0 and newer Firmware exclusion
@@ -1545,7 +1546,7 @@ static const struct mei_cfg mei_me_pch12MEI_CFG_KIND_ITOUCH ,MEI_CFG_PCH8_HFS ,MEI_CFG_FW_VER_SUPP , - MEI_CFG_FW_SPS, + MEI_CFG_FW_SPS_IGN, };/* Tiger Lake and newer devices */
@@ -1562,7 +1563,7 @@ static const struct mei_cfg mei_me_pch15MEI_CFG_FW_VER_SUPP ,MEI_CFG_DMA_128 ,MEI_CFG_TRC , - MEI_CFG_FW_SPS, + MEI_CFG_FW_SPS_IGN, };/*
Greg Kroah-Hartman
maintainerPATCH 20/1126 mei: me: add Alder Lake N device id.
In reply to Greg Kroah-HartmanFrom: Alexander Usyskin <[email protected]>
commit 7bbbd0845818cffa9fa8ccfe52fa1cad58e7e4f2 upstream.
Add Alder Lake N device ID.
--- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + 2 files changed, 2 insertions(+)
drivers/misc/mei/hw-me-regs.h +1 -0
@@ -107,6 +107,7 @@#define MEI_DEV_ID_ADP_S 0x7AE8/* Alder Lake Point S */ #define MEI_DEV_ID_ADP_LP 0x7A60/* Alder Lake Point LP */ #define MEI_DEV_ID_ADP_P 0x51E0/* Alder Lake Point P */ +#define MEI_DEV_ID_ADP_N 0x54E0/* Alder Lake Point N */ /* * MEI HW Section
drivers/misc/mei/pci-me.c +1 -0
@@ -113,6 +113,7 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_S, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_LP, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_P, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_N, MEI_ME_PCH15_CFG)},/* required last entry */ {0, }
Greg Kroah-Hartman
maintainerPATCH 21/1126 mei: avoid iterator usage outside of list_for_each_entry
In reply to Greg Kroah-HartmanFrom: Alexander Usyskin <[email protected]>
commit c10187b1c5ebb8681ca467ab7b0ded5ea415d258 upstream.
Usage of the iterator outside of the list_for_each_entry is considered harmful. https://lkml.org/lkml/2022/2/17/1032
Do not reference the loop variable outside of the loop, by rearranging the orders of execution.
Instead of performing search loop and checking outside the loop if the end of the list was hit and no matching element was found, the execution is performed inside the loop upon a successful match followed by a goto statement to the next step,
therefore no condition has to be performed after the loop has ended.
--- drivers/misc/mei/interrupt.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
drivers/misc/mei/interrupt.c +15 -20
@@ -424,31 +424,26 @@ int mei_irq_read_handler(struct mei_devilist_for_each_entry (cl, &dev->file_list, link) {if (mei_cl_hbm_equal (cl, mei_hdr)) {cl_dbg (dev, cl,"got a message\n" ); -break ; + ret =mei_cl_irq_read_msg (cl, mei_hdr, meta_hdr, cmpl_list); + goto reset_slots; } }/* if no recipient cl was found we assume corrupted header */ -if (&cl->link == &dev->file_list) { -/* A message for not connected fixed address clients -* should be silently discarded -* On power down client may be force cleaned, -* silently discard such messages -*/ -if (hdr_is_fixed (mei_hdr) || - dev->dev_state ==MEI_DEV_POWER_DOWN ) { -mei_irq_discard_msg (dev, mei_hdr, mei_hdr->length); - ret =0 ; - goto reset_slots; - } -dev_err (dev->dev,"no destination client found 0x%08X\n" , - dev->rd_msg_hdr[0 ]); - ret = -EBADMSG ; - goto end; +/* A message for not connected fixed address clients +* should be silently discarded +* On power down client may be force cleaned, +* silently discard such messages +*/ +if (hdr_is_fixed (mei_hdr) || + dev->dev_state ==MEI_DEV_POWER_DOWN ) { +mei_irq_discard_msg (dev, mei_hdr, mei_hdr->length); + ret =0 ; + goto reset_slots; } - - ret =mei_cl_irq_read_msg (cl, mei_hdr, meta_hdr, cmpl_list); - +dev_err (dev->dev,"no destination client found 0x%08X\n" , dev->rd_msg_hdr[0 ]); + ret = -EBADMSG ; + goto end; reset_slots:/* reset the number of slots and header */
Greg Kroah-Hartman
maintainerPATCH 12/1126 block: ensure plug merging checks the correct queue at least once
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 5b2050718d095cd3242d1f42aaaea3a2fec8e6f0 upstream.
Song reports that a RAID rebuild workload runs much slower recently, and it is seeing a lot less merging than it did previously. The reason is that a previous commit reduced the amount of work we do for plug merging. RAID rebuild interleaves requests between disks, so a last-entry check in plug merging always misses a merge opportunity since we always find a different disk than what we are looking for.
Modify the logic such that it's still a one-hit cache, but ensure that we check enough to find the right target before giving up.
--- block/blk-merge.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
block/blk-merge.c +14 -6
@@ -1089,12 +1089,20 @@ bool blk_attempt_plug_merge(struct requeif (!plug ||rq_list_empty (plug->mq_list))return false; -/* check the previously added entry for a quick merge attempt */ - rq =rq_list_peek (&plug->mq_list); -if (rq->q == q) { -if (blk_attempt_bio_merge (q, rq, bio, nr_segs, false) == -BIO_MERGE_OK ) -return true; +rq_list_for_each (&plug->mq_list, rq) { +if (rq->q == q) { +if (blk_attempt_bio_merge (q, rq, bio, nr_segs, false) == +BIO_MERGE_OK ) +return true; +break ; + } + +/* +* Only keep iterating plug list for merges if we have multiple +* queues +*/ +if (!plug->multiple_queues) +break ; }return false; }
Greg Kroah-Hartman
maintainerPATCH 128/1126 ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
In reply to Greg Kroah-HartmanFrom: Ammar Faizi <[email protected]>
commit b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 upstream.
Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns -ENOMEM because it leads to a NULL pointer dereference bug.
The dmesg says:
[ T1387] sof-audio-pci-intel-tgl 0000:00:1f.3: error: memory alloc failed: -12
[ T1387] BUG: kernel NULL pointer dereference, address: 0000000000000000
[ T1387] #PF: supervisor read access in kernel mode
[ T1387] #PF: error_code(0x0000) - not-present page
[ T1387] PGD 0 P4D 0
[ T1387] Oops: 0000 [#1] PREEMPT SMP NOPTI
[ T1387] CPU: 6 PID: 1387 Comm: alsa-sink-HDA A Tainted: G W 5.17.0-rc4-superb-owl-00055-g80d47f5de5e3
[ T1387] Hardware name: HP HP Laptop 14s-dq2xxx/87FD, BIOS F.15 09/15/2021
[ T1387] RIP: 0010:dma_free_noncontiguous+0x37/0x80
[ T1387] Code: [... snip ...]
[ T1387] RSP: 0000:ffffc90002b87770 EFLAGS: 00010246
[ T1387] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ T1387] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888101db30d0
[ T1387] RBP: 00000000fffffff4 R08: 0000000000000000 R09: 0000000000000000
[ T1387] R10: 0000000000000000 R11: ffffc90002b874d0 R12: 0000000000000001
[ T1387] R13: 0000000000058000 R14: ffff888105260c68 R15: ffff888105260828
[ T1387] FS: 00007f42e2ffd640(0000) GS:ffff888466b80000(0000) knlGS:0000000000000000
[ T1387] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ T1387] CR2: 0000000000000000 CR3: 000000014acf0003 CR4: 0000000000770ee0
[ T1387] PKRU: 55555554
[ T1387] Call Trace:
[ T1387] <TASK>
[ T1387] cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] [... snip ...]
[ T1387] </TASK>
--- sound/soc/sof/intel/hda-loader.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
sound/soc/sof/intel/hda-loader.c +6 -5
@@ -47,7 +47,7 @@ static struct hdac_ext_stream *cl_stream ret =snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV_SG , &pci->dev, size, dmab);if (ret <0 ) {dev_err (sdev->dev,"error: memory alloc failed: %d\n" , ret); - goto error; + goto out_put; } hstream->period_bytes =0 ;/* initialize period_bytes */
@@ -58,22 +58,23 @@ static struct hdac_ext_stream *cl_stream ret =hda_dsp_iccmax_stream_hw_params (sdev, dsp_stream, dmab,NULL );if (ret <0 ) {dev_err (sdev->dev,"error: iccmax stream prepare failed: %d\n" , ret); - goto error; + goto out_free; } }else { ret =hda_dsp_stream_hw_params (sdev, dsp_stream, dmab,NULL );if (ret <0 ) {dev_err (sdev->dev,"error: hdac prepare failed: %d\n" , ret); - goto error; + goto out_free; }hda_dsp_stream_spib_config (sdev, dsp_stream,HDA_DSP_SPIB_ENABLE , size); }return dsp_stream; -error: -hda_dsp_stream_put (sdev, direction, hstream->stream_tag); +out_free:snd_dma_free_pages (dmab); +out_put: +hda_dsp_stream_put (sdev, direction, hstream->stream_tag);return ERR_PTR (ret); }
Greg Kroah-Hartman
maintainerPATCH 135/1126 ext4: make mb_optimize_scan option work with set/unset mount cmd
In reply to Greg Kroah-HartmanFrom: Ojaswin Mujoo <[email protected]>
commit 27b38686a3bb601db48901dbc4e2fc5d77ffa2c1 upstream.
After moving to the new mount API, mb_optimize_scan mount option handling was not working as expected due to the parsed value always being overwritten by default. Refactor and fix this to the expected behavior described below:
* mb_optimize_scan=1 - On * mb_optimize_scan=0 - Off * mb_optimize_scan not passed - On if no. of BGs > threshold else off * Remounts retain previous value unless we explicitly pass the option
with a new value
--- fs/ext4/super.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
fs/ext4/super.c +14 -10
@@ -2021,12 +2021,12 @@ static int ext4_set_test_dummy_encryptio#define EXT4_SPEC_s_commit_interval (1 << 16)#define EXT4_SPEC_s_fc_debug_max_replay (1 << 17)#define EXT4_SPEC_s_sb_block (1 << 18) +#define EXT4_SPEC_mb_optimize_scan (1 << 19)struct ext4_fs_context {char *s_qf_names[EXT4_MAXQUOTAS ];char *test_dummy_enc_arg;int s_jquota_fmt;/* Format of quota to use */ -int mb_optimize_scan;#ifdef CONFIG_EXT4_DEBUG int s_fc_debug_max_replay;#endif
@@ -2451,12 +2451,17 @@ static int ext4_parse_param(struct fs_coctx_clear_mount_opt (ctx, m->mount_opt);return 0 ;case Opt_mb_optimize_scan: -if (result.int_32 !=0 && result.int_32 !=1 ) { +if (result.int_32 ==1 ) { +ctx_set_mount_opt2 (ctx,EXT4_MOUNT2_MB_OPTIMIZE_SCAN ); + ctx->spec |= EXT4_SPEC_mb_optimize_scan; + }else if (result.int_32 ==0 ) { +ctx_clear_mount_opt2 (ctx,EXT4_MOUNT2_MB_OPTIMIZE_SCAN ); + ctx->spec |= EXT4_SPEC_mb_optimize_scan; + }else {ext4_msg (NULL ,KERN_WARNING ,"mb_optimize_scan should be set to 0 or 1." );return -EINVAL ; } - ctx->mb_optimize_scan = result.int_32;return 0 ; }
@@ -4369,7 +4374,6 @@ static int __ext4_fill_super(struct fs_c/* Set defaults for the variables that will be set during parsing */ ctx->journal_ioprio =DEFAULT_JOURNAL_IOPRIO ; - ctx->mb_optimize_scan =DEFAULT_MB_OPTIMIZE_SCAN ; sbi->s_inode_readahead_blks =EXT4_DEF_INODE_READAHEAD_BLKS ; sbi->s_sectors_written_start =
@@ -5320,12 +5324,12 @@ no_journal:* turned off by passing "mb_optimize_scan=0". This can also be * turned on forcefully by passing "mb_optimize_scan=1". */ -if (ctx->mb_optimize_scan ==1 ) -set_opt2 (sb,MB_OPTIMIZE_SCAN ); -else if (ctx->mb_optimize_scan ==0 ) -clear_opt2 (sb,MB_OPTIMIZE_SCAN ); -else if (sbi->s_groups_count >=MB_DEFAULT_LINEAR_SCAN_THRESHOLD ) -set_opt2 (sb,MB_OPTIMIZE_SCAN ); +if (!(ctx->spec & EXT4_SPEC_mb_optimize_scan)) { +if (sbi->s_groups_count >=MB_DEFAULT_LINEAR_SCAN_THRESHOLD ) +set_opt2 (sb,MB_OPTIMIZE_SCAN ); +else +clear_opt2 (sb,MB_OPTIMIZE_SCAN ); + } err =ext4_mb_init (sb);if (err) {
Greg Kroah-Hartman
maintainerPATCH 62/1126 remoteproc: Fix count check in rproc_coredump_write()
In reply to Greg Kroah-HartmanFrom: Alistair Delva <[email protected]>
commit f89672cc3681952f2d06314981a6b45f8b0045d1 upstream.
Check count for 0, to avoid a potential underflow. Make the check the same as the one in rproc_recovery_write().
--- drivers/remoteproc/remoteproc_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/remoteproc_debugfs.c +1 -1
@@ -76,7 +76,7 @@ static ssize_t rproc_coredump_write(struint ret, err =0 ;char buf[20 ]; -if (count >sizeof (buf)) +if (count <1 || count >sizeof (buf))return -EINVAL ; ret =copy_from_user (buf, user_buf, count);
Greg Kroah-Hartman
maintainerPATCH 81/1126 scsi: core: sd: Add silence_suspend flag to suppress some PM messages
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit af4edb1d50c6d1044cb34bc43621411b7ba2cffe upstream.
Kernel messages produced during runtime PM can cause a never-ending cycle because user space utilities (e.g. journald or rsyslog) write the messages back to storage, causing runtime resume, more messages, and so on.
Messages that tell of things that are expected to happen are arguably unnecessary, so add a flag to suppress them. This flag is used by the UFS driver.
--- drivers/scsi/scsi_error.c | 9 +++++++-- drivers/scsi/sd.c | 6 ++++-- include/scsi/scsi_device.h | 1 + 3 files changed, 12 insertions(+), 4 deletions(-)
drivers/scsi/scsi_error.c +7 -2
@@ -484,8 +484,13 @@ static void scsi_report_sense(struct scsif (sshdr->asc ==0x29 ) { evt_type =SDEV_EVT_POWER_ON_RESET_OCCURRED ; -sdev_printk (KERN_WARNING , sdev, -"Power-on or device reset occurred\n" ); +/* +* Do not print message if it is an expected side-effect +* of runtime PM. +*/ +if (!sdev->silence_suspend) +sdev_printk (KERN_WARNING , sdev, +"Power-on or device reset occurred\n" ); }if (sshdr->asc ==0x2a && sshdr->ascq ==0x01 ) {
drivers/scsi/sd.c +4 -2
@@ -3752,7 +3752,8 @@ static int sd_suspend_common(struct devireturn 0 ;if (sdkp->WCE && sdkp->media_present) { -sd_printk (KERN_NOTICE , sdkp,"Synchronizing SCSI cache\n" ); +if (!sdkp->device->silence_suspend) +sd_printk (KERN_NOTICE , sdkp,"Synchronizing SCSI cache\n" ); ret =sd_sync_cache (sdkp, &sshdr);if (ret) {
@@ -3774,7 +3775,8 @@ static int sd_suspend_common(struct devi }if (sdkp->device->manage_start_stop) { -sd_printk (KERN_NOTICE , sdkp,"Stopping disk\n" ); +if (!sdkp->device->silence_suspend) +sd_printk (KERN_NOTICE , sdkp,"Stopping disk\n" );/* an error is not worth aborting a system sleep */ ret =sd_start_stop_device (sdkp,0 );if (ignore_stop_errors)
include/scsi/scsi_device.h +1 -0
@@ -206,6 +206,7 @@ struct scsi_device { unsigned rpm_autosuspend:1; /* Enable runtime autosuspend at device* creation time */ unsigned ignore_media_change:1; /* Ignore MEDIA CHANGE on resume */ + unsigned silence_suspend:1; /* Do not print runtime PM related messages */unsigned int queue_stopped;/* request queue is quiesced */ bool offline_already;/* Device offline message logged */
Greg Kroah-Hartman
maintainerPATCH 162/1126 crypto: rsa-pkcs1pad - restore signature length check
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit d3481accd974541e6a5d6a1fb588924a3519c36e upstream.
RSA PKCS#1 v1.5 signatures are required to be the same length as the RSA key size. RFC8017 specifically requires the verifier to check this
(https://datatracker.ietf.org/doc/html/rfc8017#section-8.2.2).
Commit a49de377e051 ("crypto: Add hash param to pkcs1pad") changed the kernel to allow longer signatures, but didn't explain this part of the change; it seems to be unrelated to the rest of the commit.
Revert this change, since it doesn't appear to be correct.
We can be pretty sure that no one is relying on overly-long signatures (which would have to be front-padded with zeroes) being supported, given that they would have been broken since commit c7381b012872 ("crypto: akcipher - new verify API for public key algorithms").
--- crypto/rsa-pkcs1pad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/rsa-pkcs1pad.c +1 -1
@@ -538,7 +538,7 @@ static int pkcs1pad_verify(struct akciphif (WARN_ON (req->dst) ||WARN_ON (!req->dst_len) || - !ctx->key_size || req->src_len < ctx->key_size) + !ctx->key_size || req->src_len != ctx->key_size)return -EINVAL ; req_ctx->out_buf =kmalloc (ctx->key_size + req->dst_len,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 122/1126 arm64: dts: qcom: sm8250: Fix MSI IRQ for PCIe1 and PCIe2
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
commit 1b7101e8124b450f2d6a35591e9cbb478c143ace upstream.
Fix the MSI IRQ used for PCIe instances 1 and 2.
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +2 -2
@@ -1801,7 +1801,7 @@ ranges = <0x01000000 0x0 0x40200000 0x0 0x40200000 0x0 0x100000>, <0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>; - interrupts = <GIC_SPI 306 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>;
@@ -1907,7 +1907,7 @@ ranges = <0x01000000 0x0 0x64200000 0x0 0x64200000 0x0 0x100000>, <0x02000000 0x0 0x64300000 0x0 0x64300000 0x0 0x3d00000>; - interrupts = <GIC_SPI 236 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>;
Greg Kroah-Hartman
maintainerPATCH 159/1126 exec: Force single empty string when argv is empty
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit dcd46d897adb70d63e025f175a00a89797d31a43 upstream.
Quoting[1] Ariadne Conill:
"In several other operating systems, it is a hard requirement that the second argument to execve(2) be the name of a program, thus prohibiting a scenario where argc < 1. POSIX 2017 also recommends this behaviour, but it is not an explicit requirement[2]:
The argument arg0 should point to a filename string that is associated with the process being started by one of the exec functions.
...
Interestingly, Michael Kerrisk opened an issue about this in 2008[3], but there was no consensus to support fixing this issue then. Hopefully now that CVE-2021-4034 shows practical exploitative use[4] of this bug in a shellcode, we can reconsider.
This issue is being tracked in the KSPP issue tracker[5]."
While the initial code searches[6][7] turned up what appeared to be mostly corner case tests, trying to that just reject argv == NULL (or an immediately terminated pointer list) quickly started tripping[8] existing userspace programs.
The next best approach is forcing a single empty string into argv and adjusting argc to match. The number of programs depending on argc == 0 seems a smaller set than those calling execve with a NULL argv.
Account for the additional stack space in bprm_stack_limits(). Inject an empty string when argc == 0 (and set argc = 1). Warn about the case so userspace has some notice about the change:
process './argc0' launched './argc0' with NULL argv: empty string added
Additionally WARN() and reject NULL argv usage for kernel threads.
[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html
[3] https://bugzilla.kernel.org/show_bug.cgi?id=8408
[4] https://www.qualys.com/2022/01/25/cve-2021-4034/pwnkit.txt
[5] https://github.com/KSPP/linux/issues/176
[6] https://codesearch.debian.net/search?q=execve%5C+*%5C%28%5B%5E%2C%5D%2B%2C+*NULL&literal=0
[7] https://codesearch.debian.net/search?q=execlp%3F%5Cs*%5C%28%5B%5E%2C%5D%2B%2C%5Cs*NULL&literal=0
[8] https://lore.kernel.org/lkml/20220131144352.GE16385@xsang-OptiPlex-9020/
--- fs/exec.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
fs/exec.c +25 -1
@@ -495,8 +495,14 @@ static int bprm_stack_limits(struct linu* the stack. They aren't stored until much later when we can't * signal to the parent that the child has run out of stack space. * Instead, calculate it here so it's possible to fail gracefully. +* +* In the case of argc = 0, make sure there is space for adding a +* empty string (which will bump argc to 1), to ensure confused +* userspace programs don't start processing from argv[1], thinking +* argc can never be 0, to keep them from walking envp by accident. +* See do_execveat_common(). */ - ptr_size = (bprm->argc + bprm->envc) *sizeof (void *); + ptr_size = (max (bprm->argc,1 ) + bprm->envc) *sizeof (void *);if (limit <= ptr_size)return -E2BIG ; limit -= ptr_size;
@@ -1897,6 +1903,9 @@ static int do_execveat_common(int fd, st } retval =count (argv,MAX_ARG_STRINGS ); +if (retval ==0 ) +pr_warn_once ("process '%s' launched '%s' with NULL argv: empty string added\n" , + current->comm, bprm->filename);if (retval <0 ) goto out_free; bprm->argc = retval;
@@ -1923,6 +1932,19 @@ static int do_execveat_common(int fd, stif (retval <0 ) goto out_free; +/* +* When argv is empty, add an empty string ("") as argv[0] to +* ensure confused userspace programs that start processing +* from argv[1] won't end up walking envp. See also +* bprm_stack_limits(). +*/ +if (bprm->argc ==0 ) { + retval =copy_string_kernel ("" , bprm); +if (retval <0 ) + goto out_free; + bprm->argc =1 ; + } + retval =bprm_execve (bprm, fd, filename, flags); out_free:free_bprm (bprm);
@@ -1951,6 +1973,8 @@ int kernel_execve(const char *kernel_fil } retval =count_strings_kernel (argv); +if (WARN_ON_ONCE (retval ==0 )) + retval = -EINVAL ;if (retval <0 ) goto out_free; bprm->argc = retval;
Greg Kroah-Hartman
maintainerPATCH 72/1126 can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit 3d3925ff6433f98992685a9679613a2cc97f3ce2 upstream.
There is no need to call dev_kfree_skb() when usb_submit_urb() fails because can_put_echo_skb() deletes original skb and can_free_echo_skb() deletes the cloned skb.
--- drivers/net/can/usb/usb_8dev.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-)
drivers/net/can/usb/usb_8dev.c +14 -16
@@ -663,9 +663,20 @@ static netdev_tx_t usb_8dev_start_xmit(satomic_inc (&priv->active_tx_urbs); err =usb_submit_urb (urb,GFP_ATOMIC ); -if (unlikely (err)) - goto failed; -else if (atomic_read (&priv->active_tx_urbs) >=MAX_TX_URBS ) +if (unlikely (err)) { +can_free_echo_skb (netdev, context->echo_index,NULL ); + +usb_unanchor_urb (urb); +usb_free_coherent (priv->udev, size, buf, urb->transfer_dma); + +atomic_dec (&priv->active_tx_urbs); + +if (err == -ENODEV ) +netif_device_detach (netdev); +else +netdev_warn (netdev,"failed tx_urb %d\n" , err); + stats->tx_dropped++; + }else if (atomic_read (&priv->active_tx_urbs) >=MAX_TX_URBS )/* Slow down tx path */ netif_stop_queue (netdev);
@@ -684,19 +695,6 @@ nofreecontext:return NETDEV_TX_BUSY ; -failed: -can_free_echo_skb (netdev, context->echo_index,NULL ); - -usb_unanchor_urb (urb); -usb_free_coherent (priv->udev, size, buf, urb->transfer_dma); - -atomic_dec (&priv->active_tx_urbs); - -if (err == -ENODEV ) -netif_device_detach (netdev); -else -netdev_warn (netdev,"failed tx_urb %d\n" , err); - nomembuf:usb_free_urb (urb);
Greg Kroah-Hartman
maintainerPATCH 138/1126 landlock: Use square brackets around "landlock-ruleset"
In reply to Greg Kroah-HartmanFrom: Christian Brauner <[email protected]>
commit aea0b9f2486da8497f35c7114b764bf55e17c7ea upstream.
Make the name of the anon inode fd "[landlock-ruleset]" instead of "landlock-ruleset". This is minor but most anon inode fds already carry square brackets around their name:
[eventfd]
[eventpoll]
[fanotify]
[fscontext]
[io_uring]
[pidfd]
[signalfd]
[timerfd]
[userfaultfd]For the sake of consistency lets do the same for the landlock-ruleset anon inode fd that comes with landlock. We did the same in 1cdc415f1083 ("uapi, fsopen: use square brackets around "fscontext" [ver #2]") for the new mount api.
--- security/landlock/syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/landlock/syscalls.c +1 -1
@@ -192,7 +192,7 @@ SYSCALL_DEFINE3(landlock_create_ruleset,return PTR_ERR (ruleset);/* Creates anonymous FD referring to the ruleset. */ - ruleset_fd =anon_inode_getfd ("landlock-ruleset" , &ruleset_fops, + ruleset_fd =anon_inode_getfd ("[landlock-ruleset]" , &ruleset_fops, ruleset,O_RDWR |O_CLOEXEC );if (ruleset_fd <0 )landlock_put_ruleset (ruleset);
Greg Kroah-Hartman
maintainerPATCH 86/1126 qed: validate and restrict untrusted VFs vlan promisc mode
In reply to Greg Kroah-HartmanFrom: Manish Chopra <[email protected]>
commit cbcc44db2cf7b836896733acc0e5ea966136ed22 upstream.
Today when VFs are put in promiscuous mode, they can request PF to configure device for them to receive all VLANs traffic regardless of what vlan is configured by the PF (via ip link) and PF allows this config request regardless of whether VF is trusted or not.
Quoted 1 line
From security POV, when VLAN is configured for VF through PF (via ip link),
honour such config requests from VF only when they are configured to be trusted, otherwise restrict such VFs vlan promisc mode config.
--- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 28 ++++++++++++++++++++++++++-- drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 + 2 files changed, 27 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_sriov.c +26 -2
@@ -2984,12 +2984,16 @@ static int qed_iov_pre_update_vport(struu8 mask =QED_ACCEPT_UCAST_UNMATCHED |QED_ACCEPT_MCAST_UNMATCHED ;struct qed_filter_accept_flags *flags = ¶ms->accept_flags;struct qed_public_vf_info *vf_info; +u16 tlv_mask; + + tlv_mask =BIT (QED_IOV_VP_UPDATE_ACCEPT_PARAM ) | +BIT (QED_IOV_VP_UPDATE_ACCEPT_ANY_VLAN );/* Untrusted VFs can't even be trusted to know that fact. * Simply indicate everything is configured fine, and trace * configuration 'behind their back'. */ -if (!(*tlvs &BIT (QED_IOV_VP_UPDATE_ACCEPT_PARAM ))) +if (!(*tlvs & tlv_mask))return 0 ; vf_info =qed_iov_get_public_vf_info (hwfn, vfid, true);
@@ -3006,6 +3010,13 @@ static int qed_iov_pre_update_vport(stru flags->tx_accept_filter &= ~mask; } +if (params->update_accept_any_vlan_flg) { + vf_info->accept_any_vlan = params->accept_any_vlan; + +if (vf_info->forced_vlan && !vf_info->is_trusted_configured) + params->accept_any_vlan = false; + } +return 0 ; }
@@ -5150,6 +5161,12 @@ static void qed_iov_handle_trust_change( params.update_ctl_frame_check =1 ; params.mac_chk_en = !vf_info->is_trusted_configured; + params.update_accept_any_vlan_flg =0 ; + +if (vf_info->accept_any_vlan && vf_info->forced_vlan) { + params.update_accept_any_vlan_flg =1 ; + params.accept_any_vlan = vf_info->accept_any_vlan; + }if (vf_info->rx_accept_mode & mask) { flags->update_rx_mode_config =1 ;
@@ -5165,13 +5182,20 @@ static void qed_iov_handle_trust_change(if (!vf_info->is_trusted_configured) { flags->rx_accept_filter &= ~mask; flags->tx_accept_filter &= ~mask; + params.accept_any_vlan = false; }if (flags->update_rx_mode_config || flags->update_tx_mode_config || - params.update_ctl_frame_check) + params.update_ctl_frame_check || + params.update_accept_any_vlan_flg) { +DP_VERBOSE (hwfn,QED_MSG_IOV , +"vport update config for %s VF[abs 0x%x rel 0x%x]\n" , + vf_info->is_trusted_configured ?"trusted" :"untrusted" , + vf->abs_vf_id, vf->relative_vf_id);qed_sp_vport_update (hwfn, ¶ms,QED_SPQ_MODE_EBLOCK ,NULL ); + } } }
drivers/net/ethernet/qlogic/qed/qed_sriov.h +1 -0
@@ -62,6 +62,7 @@ struct qed_public_vf_info {bool is_trusted_request;u8 rx_accept_mode;u8 tx_accept_mode; +bool accept_any_vlan; };struct qed_iov_vf_init_params {
Greg Kroah-Hartman
maintainerPATCH 163/1126 crypto: rsa-pkcs1pad - fix buffer overread in pkcs1pad_verify_complete()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit a24611ea356c7f3f0ec926da11b9482ac1f414fd upstream.
Before checking whether the expected digest_info is present, we need to check that there are enough bytes remaining.
--- crypto/rsa-pkcs1pad.c | 2 ++ 1 file changed, 2 insertions(+)
crypto/rsa-pkcs1pad.c +2 -0
@@ -476,6 +476,8 @@ static int pkcs1pad_verify_complete(stru pos++;if (digest_info) { +if (digest_info->size > dst_len - pos) + goto done;if (crypto_memneq (out_buf + pos, digest_info->data, digest_info->size)) goto done;
Greg Kroah-Hartman
maintainerPATCH 79/1126 mm: invalidate hwpoison page cache page in fault path
In reply to Greg Kroah-HartmanFrom: Rik van Riel <[email protected]>
commit e53ac7374e64dede04d745ff0e70ff5048378d1f upstream.
Sometimes the page offlining code can leave behind a hwpoisoned clean page cache page. This can lead to programs being killed over and over and over again as they fault in the hwpoisoned page, get killed, and then get re-spawned by whatever wanted to run them.
This is particularly embarrassing when the page was offlined due to having too many corrected memory errors. Now we are killing tasks due to them trying to access memory that probably isn't even corrupted.
This problem can be avoided by invalidating the page from the page fault handler, which already has a branch for dealing with these kinds of pages. With this patch we simply pretend the page fault was successful if the page was invalidated, return to userspace, incur another page fault, read in the file from disk (to a new memory page), and then everything works again.
--- mm/memory.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
mm/memory.c +7 -2
@@ -3893,11 +3893,16 @@ static vm_fault_t __do_fault(struct vm_freturn ret;if (unlikely (PageHWPoison (vmf->page))) { -if (ret &VM_FAULT_LOCKED ) +vm_fault_t poisonret =VM_FAULT_HWPOISON ; +if (ret &VM_FAULT_LOCKED ) { +/* Retry if a clean page was removed from the cache. */ +if (invalidate_inode_page (vmf->page)) + poisonret =0 ;unlock_page (vmf->page); + }put_page (vmf->page); vmf->page =NULL ; -return VM_FAULT_HWPOISON ; +return poisonret; }if (unlikely (!(ret &VM_FAULT_LOCKED )))
Greg Kroah-Hartman
maintainerPATCH 136/1126 ext4: make mb_optimize_scan performance mount option work with extents
In reply to Greg Kroah-HartmanFrom: Ojaswin Mujoo <[email protected]>
commit 077d0c2c78df6f7260cdd015a991327efa44d8ad upstream.
Currently mb_optimize_scan scan feature which improves filesystem performance heavily (when FS is fragmented), seems to be not working with files with extents (ext4 by default has files with extents).
This patch fixes that and makes mb_optimize_scan feature work for files with extents.
Below are some performance numbers obtained when allocating a 10M and 100M file with and w/o this patch on a filesytem with no 1M contiguous block.
<perf numbers>
===============
Workload: dd if=/dev/urandom of=test conv=fsync bs=1M count=10/100
Time taken
=====================================================
no. Size without-patch with-patch Diff(%) 1 10M 0m8.401s 0m5.623s 33.06% 2 100M 1m40.465s 1m14.737s 25.6%
<debug stats>
=============
w/o patch:
mballoc:
reqs: 17056
success: 11407
groups_scanned: 13643
cr0_stats:
hits: 37
groups_considered: 9472
useless_loops: 36
bad_suggestions: 0
cr1_stats:
hits: 11418
groups_considered: 908560
useless_loops: 1894
bad_suggestions: 0
cr2_stats:
hits: 1873
groups_considered: 6913
useless_loops: 21
cr3_stats:
hits: 21
groups_considered: 5040
useless_loops: 21
extents_scanned: 417364
goal_hits: 3707
2^n_hits: 37
breaks: 1873
lost: 0
buddies_generated: 239/240
buddies_time_used: 651080
preallocated: 705
discarded: 478with patch:
mballoc:
reqs: 12768
success: 11305
groups_scanned: 12768
cr0_stats:
hits: 1
groups_considered: 18
useless_loops: 0
bad_suggestions: 0
cr1_stats:
hits: 5829
groups_considered: 50626
useless_loops: 0
bad_suggestions: 0
cr2_stats:
hits: 6938
groups_considered: 580363
useless_loops: 0
cr3_stats:
hits: 0
groups_considered: 0
useless_loops: 0
extents_scanned: 309059
goal_hits: 0
2^n_hits: 1
breaks: 1463
lost: 0
buddies_generated: 239/240
buddies_time_used: 791392
preallocated: 673
discarded: 446--- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/mballoc.c +1 -1
@@ -1000,7 +1000,7 @@ static inline int should_optimize_scan(sreturn 0 ;if (ac->ac_criteria >=2 )return 0 ; -if (ext4_test_inode_flag (ac->ac_inode,EXT4_INODE_EXTENTS )) +if (!ext4_test_inode_flag (ac->ac_inode,EXT4_INODE_EXTENTS ))return 0 ;return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 65/1126 pinctrl: samsung: drop pin banks references on error paths
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 50ebd19e3585b9792e994cfa8cbee8947fe06371 upstream.
The driver iterates over its devicetree children with for_each_child_of_node() and stores for later found node pointer. This has to be put in error paths to avoid leak during re-probing.
--- drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/pinctrl/samsung/pinctrl-samsung.c +23 -7
@@ -1002,6 +1002,16 @@ samsung_pinctrl_get_soc_data_for_of_aliareturn &(of_data->ctrl[id]); } +static void samsung_banks_of_node_put (struct samsung_pinctrl_drv_data *d) +{ +struct samsung_pin_bank *bank; +unsigned int i; + + bank = d->pin_banks; +for (i =0 ; i < d->nr_banks; ++i, ++bank) +of_node_put (bank->of_node); +} +/* retrieve the soc specific data */ static const struct samsung_pin_ctrl * samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d,
@@ -1117,19 +1127,19 @@ static int samsung_pinctrl_probe(structif (ctrl->retention_data) { drvdata->retention_ctrl = ctrl->retention_data->init (drvdata, ctrl->retention_data); -if (IS_ERR (drvdata->retention_ctrl)) -return PTR_ERR (drvdata->retention_ctrl); +if (IS_ERR (drvdata->retention_ctrl)) { + ret =PTR_ERR (drvdata->retention_ctrl); + goto err_put_banks; + } } ret =samsung_pinctrl_register (pdev, drvdata);if (ret) -return ret; + goto err_put_banks; ret =samsung_gpiolib_register (pdev, drvdata); -if (ret) { -samsung_pinctrl_unregister (pdev, drvdata); -return ret; - } +if (ret) + goto err_unregister;if (ctrl->eint_gpio_init) ctrl->eint_gpio_init (drvdata);
@@ -1139,6 +1149,12 @@ static int samsung_pinctrl_probe(structplatform_set_drvdata (pdev, drvdata);return 0 ; + +err_unregister: +samsung_pinctrl_unregister (pdev, drvdata); +err_put_banks: +samsung_banks_of_node_put (drvdata); +return ret; }/*
Greg Kroah-Hartman
maintainerPATCH 101/1126 rtc: pl031: fix rtc features null pointer dereference
In reply to Greg Kroah-HartmanFrom: Ali Pouladi <[email protected]>
commit ea6af39f3da50c86367a71eb3cc674ade3ed244c upstream.
When there is no interrupt line, rtc alarm feature is disabled.
The clearing of the alarm feature bit was being done prior to allocations of ldata->rtc device, resulting in a null pointer dereference.
Clear RTC_FEATURE_ALARM after the rtc device is allocated.
--- drivers/rtc/rtc-pl031.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/rtc/rtc-pl031.c +3 -3
@@ -350,9 +350,6 @@ static int pl031_probe(struct amba_devic } } -if (!adev->irq[0 ]) -clear_bit (RTC_FEATURE_ALARM , ldata->rtc->features); -device_init_wakeup (&adev->dev, true); ldata->rtc =devm_rtc_allocate_device (&adev->dev);if (IS_ERR (ldata->rtc)) {
@@ -360,6 +357,9 @@ static int pl031_probe(struct amba_devic goto out; } +if (!adev->irq[0 ]) +clear_bit (RTC_FEATURE_ALARM , ldata->rtc->features); + ldata->rtc->ops = ops; ldata->rtc->range_min = vendor->range_min; ldata->rtc->range_max = vendor->range_max;
Greg Kroah-Hartman
maintainerPATCH 70/1126 can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit c70222752228a62135cee3409dccefd494a24646 upstream.
There is no need to call dev_kfree_skb() when usb_submit_urb() fails beacause can_put_echo_skb() deletes the original skb and can_free_echo_skb() deletes the cloned skb.
--- drivers/net/can/usb/ems_usb.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/can/usb/ems_usb.c +0 -1
@@ -819,7 +819,6 @@ static netdev_tx_t ems_usb_start_xmit(stusb_unanchor_urb (urb);usb_free_coherent (dev->udev, size, buf, urb->transfer_dma); -dev_kfree_skb (skb);atomic_dec (&dev->active_tx_urbs);
Greg Kroah-Hartman
maintainerPATCH 151/1126 ARM: dts: exynos: fix UART3 pins configuration in Exynos5250
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 372d7027fed43c8570018e124cf78b89523a1f8e upstream.
The gpa1-4 pin was put twice in UART3 pin configuration of Exynos5250, instead of proper pin gpa1-5.
--- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/exynos5250-pinctrl.dtsi +1 -1
@@ -260,7 +260,7 @@ }; uart3_data: uart3-data { - samsung,pins = "gpa1-4", "gpa1-4"; + samsung,pins = "gpa1-4", "gpa1-5"; samsung,pin-function = <EXYNOS_PIN_FUNC_2>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
Greg Kroah-Hartman
maintainerPATCH 134/1126 ext4: fix fs corruption when tring to remove a non-empty directory with IO error
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit 7aab5c84a0f6ec2290e2ba4a6b245178b1bf949a upstream.
We inject IO error when rmdir non empty direcory, then got issue as follows:
step1: mkfs.ext4 -F /dev/sda
step2: mount /dev/sda test
step3: cd test
step4: mkdir -p 1/2
step5: rmdir 1
[ 110.920551] ext4_empty_dir: inject fault [ 110.921926] EXT4-fs warning (device sda): ext4_rmdir:3113: inode #12: comm rmdir: empty directory '1' has too many links (3)
step6: cd ..
step7: umount test
step8: fsck.ext4 -f /dev/sda
e2fsck 1.42.9 (28-Dec-2013)
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Entry '..' in .../??? (13) has deleted/unused inode 12. Clear<y>? yes Pass 3: Checking directory connectivity
Unconnected directory inode 13 (...)
Connect to /lost+found<y>? yes
Pass 4: Checking reference counts
Inode 13 ref count is 3, should be 2. Fix<y>? yes
Pass 5: Checking group summary information
/dev/sda: ***** FILE SYSTEM WAS MODIFIED *****
/dev/sda: 12/131072 files (0.0% non-contiguous), 26157/524288 blocks
ext4_rmdir
if (!ext4_empty_dir(inode)) goto end_rmdir; ext4_empty_dir bh = ext4_read_dirblock(inode, 0, DIRENT_HTREE); if (IS_ERR(bh)) return true;
Now if read directory block failed, 'ext4_empty_dir' will return true, assume directory is empty. Obviously, it will lead to above issue.
To solve this issue, if read directory block failed 'ext4_empty_dir' just return false. To avoid making things worse when file system is already corrupted, 'ext4_empty_dir' also return false.
--- fs/ext4/inline.c | 9 ++++----- fs/ext4/namei.c | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-)
fs/ext4/inline.c +4 -5
@@ -1783,19 +1783,20 @@ bool empty_inline_dir(struct inode *dir,void *inline_pos;unsigned int offset;struct ext4_dir_entry_2 *de; -bool ret = true; +bool ret = false; err =ext4_get_inode_loc (dir, &iloc);if (err) {EXT4_ERROR_INODE_ERR (dir, -err,"error %d getting inode %lu block" , err, dir->i_ino); -return true; +return false; }down_read (&EXT4_I (dir)->xattr_sem);if (!ext4_has_inline_data (dir)) { *has_inline_data =0 ; + ret = true; goto out; }
@@ -1804,7 +1805,6 @@ bool empty_inline_dir(struct inode *dir,ext4_warning (dir->i_sb,"bad inline directory (dir #%lu) - no `..'" , dir->i_ino); - ret = true; goto out; }
@@ -1823,16 +1823,15 @@ bool empty_inline_dir(struct inode *dir, dir->i_ino,le32_to_cpu (de->inode),le16_to_cpu (de->rec_len), de->name_len, inline_size); - ret = true; goto out; }if (le32_to_cpu (de->inode)) { - ret = false; goto out; } offset +=ext4_rec_len_from_disk (de->rec_len, inline_size); } + ret = true; out:up_read (&EXT4_I (dir)->xattr_sem);brelse (iloc.bh);
fs/ext4/namei.c +5 -5
@@ -2997,14 +2997,14 @@ bool ext4_empty_dir(struct inode *inode)if (inode->i_size <ext4_dir_rec_len (1 ,NULL ) +ext4_dir_rec_len (2 ,NULL )) {EXT4_ERROR_INODE (inode,"invalid size" ); -return true; +return false; }/* The first directory block must not be a hole, * so treat it as DIRENT_HTREE */ bh =ext4_read_dirblock (inode,0 ,DIRENT_HTREE );if (IS_ERR (bh)) -return true; +return false; de = (struct ext4_dir_entry_2 *) bh->b_data; if (ext4_check_dir_entry(inode, NULL, de, bh, bh->b_data, bh->b_size,
@@ -3012,7 +3012,7 @@ bool ext4_empty_dir(struct inode *inode) le32_to_cpu(de->inode) != inode->i_ino || strcmp(".", de->name)) {ext4_warning_inode (inode,"directory missing '.'" );brelse (bh); -return true; +return false; } offset =ext4_rec_len_from_disk (de->rec_len, sb->s_blocksize); de =ext4_next_entry (de, sb->s_blocksize);
@@ -3021,7 +3021,7 @@ bool ext4_empty_dir(struct inode *inode) le32_to_cpu(de->inode) == 0 || strcmp("..", de->name)) {ext4_warning_inode (inode,"directory missing '..'" );brelse (bh); -return true; +return false; } offset +=ext4_rec_len_from_disk (de->rec_len, sb->s_blocksize);while (offset < inode->i_size) {
@@ -3035,7 +3035,7 @@ bool ext4_empty_dir(struct inode *inode)continue ; }if (IS_ERR (bh)) -return true; +return false; } de = (struct ext4_dir_entry_2 *) (bh->b_data + (offset & (sb->s_blocksize -1 )));
Greg Kroah-Hartman
maintainerPATCH 91/1126 Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads"
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
commit 8b188fba75195745026e11d408e4a7e94e01d701 upstream.
This reverts commit 37ef4c19b4c659926ce65a7ac709ceaefb211c40.
The touchpad present in the Dell Precision 7550 and 7750 laptops reports a HID_DG_BUTTONTYPE of type MT_BUTTONTYPE_CLICKPAD. However, the device is not a clickpad, it is a touchpad with physical buttons.
In order to fix this issue, a quirk for the device was introduced in libinput [1] [2] to disable the INPUT_PROP_BUTTONPAD property:
[Precision 7x50 Touchpad]
MatchBus=i2c
MatchUdevType=touchpad MatchDMIModalias=dmi:*svnDellInc.:pnPrecision7?50* AttrInputPropDisable=INPUT_PROP_BUTTONPAD
However, because of the change introduced in 37ef4c19b4 ("Input: clear BTN_RIGHT/MIDDLE on buttonpads") the BTN_RIGHT key bit is not mapped anymore breaking the device right click button and making impossible to workaround it in user space.
In order to avoid breakage on other present or future devices, revert the patch causing the issue.
--- drivers/input/input.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/input/input.c +0 -6
@@ -2285,12 +2285,6 @@ int input_register_device(struct input_d/* KEY_RESERVED is not supposed to be transmitted to userspace. */ __clear_bit (KEY_RESERVED , dev->keybit); -/* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */ -if (test_bit (INPUT_PROP_BUTTONPAD , dev->propbit)) { -__clear_bit (BTN_RIGHT , dev->keybit); -__clear_bit (BTN_MIDDLE , dev->keybit); - } -/* Make sure that bitmasks not mentioned in dev->evbit are clean. */ input_cleanse_bitmasks (dev);
Greg Kroah-Hartman
maintainerPATCH 109/1126 mm: only re-generate demotion targets when a numa node changes its N_CPU state
In reply to Greg Kroah-HartmanFrom: Oscar Salvador <[email protected]>
commit 734c15700cdf9062ae98d8b131c6fe873dfad26d upstream.
Abhishek reported that after patch [1], hotplug operations are taking roughly double the expected time. [2]
The reason behind is that the CPU callbacks that migrate_on_reclaim_init() sets always call set_migration_target_nodes() whenever a CPU is brought up/down.
But we only care about numa nodes going from having cpus to become cpuless, and vice versa, as that influences the demotion_target order.
We do already have two CPU callbacks (vmstat_cpu_online() and vmstat_cpu_dead()) that check exactly that, so get rid of the CPU callbacks in migrate_on_reclaim_init() and only call set_migration_target_nodes() from vmstat_cpu_{dead,online}() whenever a numa node change its N_CPU state.
[1] https://lore.kernel.org/linux-mm/[email protected]/
[2] https://lore.kernel.org/linux-mm/[email protected]/
--- include/linux/migrate.h | 8 ++++++++ mm/migrate.c | 47 ++++++++++------------------------------------- mm/vmstat.c | 13 ++++++++++++- 3 files changed, 30 insertions(+), 38 deletions(-)
include/linux/migrate.h +8 -0
@@ -48,7 +48,15 @@ int folio_migrate_mapping(struct address struct folio *newfolio, struct folio *folio, int extra_count);extern bool numa_demotion_enabled; +extern void migrate_on_reclaim_init (void ); +#ifdef CONFIG_HOTPLUG_CPU +extern void set_migration_target_nodes (void );#else +static inline void set_migration_target_nodes (void ) {} +#endif +#else + +static inline void set_migration_target_nodes (void ) {}static inline void putback_movable_pages (struct list_head *l) {} static inline int migrate_pages(struct list_head *l, new_page_t new,
mm/migrate.c +10 -37
68 lines not on this page · raw message
mm/vmstat.c +12 -1
@@ -28,6 +28,7 @@#include <linux/mm_inline.h> #include <linux/page_ext.h> #include <linux/page_owner.h> +#include <linux/migrate.h> #include "internal.h"
@@ -2043,7 +2044,12 @@ static void __init init_cpu_node_state(vstatic int vmstat_cpu_online (unsigned int cpu) {refresh_zone_stat_thresholds (); -node_set_state (cpu_to_node (cpu),N_CPU ); + +if (!node_state (cpu_to_node (cpu),N_CPU )) { +node_set_state (cpu_to_node (cpu),N_CPU ); +set_migration_target_nodes (); + } +return 0 ; }
@@ -2066,6 +2072,8 @@ static int vmstat_cpu_dead(unsigned intreturn 0 ;node_clear_state (node,N_CPU ); +set_migration_target_nodes (); +return 0 ; }
@@ -2097,6 +2105,9 @@ void __init init_mm_internals(void)start_shepherd_timer ();#endif +#if defined(CONFIG_MIGRATION ) && defined(CONFIG_HOTPLUG_CPU ) +migrate_on_reclaim_init (); +#endif #ifdef CONFIG_PROC_FS proc_create_seq ("buddyinfo" ,0444 ,NULL , &fragmentation_op);proc_create_seq ("pagetypeinfo" ,0400 ,NULL , &pagetypeinfo_op);
Greg Kroah-Hartman
maintainerPATCH 121/1126 arm64: Do not defer reserve_crashkernel() for platforms with no DMA memory zones
In reply to Greg Kroah-HartmanFrom: Vijay Balakrishna <[email protected]>
commit 031495635b4668f94e964e037ca93d0d38bfde58 upstream.
The following patches resulted in deferring crash kernel reservation to mem_init(), mainly aimed at platforms with DMA memory zones (no IOMMU), in particular Raspberry Pi 4.
commit 1a8e1cef7603 ("arm64: use both ZONE_DMA and ZONE_DMA32")
commit 8424ecdde7df ("arm64: mm: Set ZONE_DMA size based on devicetree's dma-ranges") commit 0a30c53573b0 ("arm64: mm: Move reserve_crashkernel() into mem_init()") commit 2687275a5843 ("arm64: Force NO_BLOCK_MAPPINGS if crashkernel reservation is required")
Above changes introduced boot slowdown due to linear map creation for all the memory banks with NO_BLOCK_MAPPINGS, see discussion[1]. The proposed changes restore crash kernel reservation to earlier behavior thus avoids slow boot, particularly for platforms with IOMMU (no DMA memory zones).
Tested changes to confirm no ~150ms boot slowdown on our SoC with IOMMU and 8GB memory. Also tested with ZONE_DMA and/or ZONE_DMA32 configs to confirm no regression to deferring scheme of crash kernel memory reservation. In both cases successfully collected kernel crash dump.
[1] https://lore.kernel.org/all/[email protected]/
--- arch/arm64/mm/init.c | 36 ++++++++++++++++++++++++++++++++---- arch/arm64/mm/mmu.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 5 deletions(-)
arch/arm64/mm/init.c +32 -4
@@ -61,8 +61,34 @@ EXPORT_SYMBOL(memstart_addr);* unless restricted on specific platforms (e.g. 30-bit on Raspberry Pi 4). * In such case, ZONE_DMA32 covers the rest of the 32-bit addressable memory, * otherwise it is empty. +* +* Memory reservation for crash kernel either done early or deferred +* depending on DMA memory zones configs (ZONE_DMA) -- +* +* In absence of ZONE_DMA configs arm64_dma_phys_limit initialized +* here instead of max_zone_phys(). This lets early reservation of +* crash kernel memory which has a dependency on arm64_dma_phys_limit. +* Reserving memory early for crash kernel allows linear creation of block +* mappings (greater than page-granularity) for all the memory bank rangs. +* In this scheme a comparatively quicker boot is observed. +* +* If ZONE_DMA configs are defined, crash kernel memory reservation +* is delayed until DMA zone memory range size initilazation performed in +* zone_sizes_init(). The defer is necessary to steer clear of DMA zone +* memory range to avoid overlap allocation. So crash kernel memory boundaries +* are not known when mapping all bank memory ranges, which otherwise means +* not possible to exclude crash kernel range from creating block mappings +* so page-granularity mappings are created for the entire memory range. +* Hence a slightly slower boot is observed. +* +* Note: Page-granularity mapppings are necessary for crash kernel memory +* range for shrinking its size via /sys/kernel/kexec_crash_size interface. */ -phys_addr_t arm64_dma_phys_limit__ro_after_init ; +#if IS_ENABLED (CONFIG_ZONE_DMA ) ||IS_ENABLED (CONFIG_ZONE_DMA32 ) +phys_addr_t __ro_after_init arm64_dma_phys_limit; +#else +const phys_addr_t arm64_dma_phys_limit =PHYS_MASK +1 ; +#endif #ifdef CONFIG_KEXEC_CORE /*
@@ -153,8 +179,6 @@ static void __init zone_sizes_init(unsigif (!arm64_dma_phys_limit) arm64_dma_phys_limit = dma32_phys_limit;#endif -if (!arm64_dma_phys_limit) - arm64_dma_phys_limit =PHYS_MASK +1 ; max_zone_pfns[ZONE_NORMAL ] = max;free_area_init (max_zone_pfns);
@@ -315,6 +339,9 @@ void __init arm64_memblock_init(void)early_init_fdt_scan_reserved_mem (); +if (!IS_ENABLED (CONFIG_ZONE_DMA ) && !IS_ENABLED (CONFIG_ZONE_DMA32 )) +reserve_crashkernel (); + high_memory =__va (memblock_end_of_DRAM () -1 ) +1 ; }
@@ -361,7 +388,8 @@ void __init bootmem_init(void)* request_standard_resources() depends on crashkernel's memory being * reserved, so do it here. */ -reserve_crashkernel (); +if (IS_ENABLED (CONFIG_ZONE_DMA ) ||IS_ENABLED (CONFIG_ZONE_DMA32 )) +reserve_crashkernel ();memblock_dump_all (); }
arch/arm64/mm/mmu.c +31 -1
@@ -517,7 +517,7 @@ static void __init map_mem(pgd_t *pgdp)*/ BUILD_BUG_ON (pgd_index (direct_map_end -1 ) ==pgd_index (direct_map_end)); -if (can_set_direct_map () || crash_mem_map ||IS_ENABLED (CONFIG_KFENCE )) +if (can_set_direct_map () ||IS_ENABLED (CONFIG_KFENCE )) flags |=NO_BLOCK_MAPPINGS |NO_CONT_MAPPINGS ;/*
@@ -528,6 +528,17 @@ static void __init map_mem(pgd_t *pgdp)*/ memblock_mark_nomap (kernel_start, kernel_end - kernel_start); +#ifdef CONFIG_KEXEC_CORE +if (crash_mem_map) { +if (IS_ENABLED (CONFIG_ZONE_DMA ) || +IS_ENABLED (CONFIG_ZONE_DMA32 )) + flags |=NO_BLOCK_MAPPINGS |NO_CONT_MAPPINGS ; +else if (crashk_res.end) +memblock_mark_nomap (crashk_res.start, +resource_size (&crashk_res)); + } +#endif +/* map all the memory banks */ for_each_mem_range (i, &start, &end) {if (start >= end)
@@ -554,6 +565,25 @@ static void __init map_mem(pgd_t *pgdp)__map_memblock (pgdp, kernel_start, kernel_end,PAGE_KERNEL ,NO_CONT_MAPPINGS );memblock_clear_nomap (kernel_start, kernel_end - kernel_start); + +/* +* Use page-level mappings here so that we can shrink the region +* in page granularity and put back unused memory to buddy system +* through /sys/kernel/kexec_crash_size interface. +*/ +#ifdef CONFIG_KEXEC_CORE +if (crash_mem_map && + !IS_ENABLED (CONFIG_ZONE_DMA ) && !IS_ENABLED (CONFIG_ZONE_DMA32 )) { +if (crashk_res.end) { +__map_memblock (pgdp, crashk_res.start, + crashk_res.end +1 , +PAGE_KERNEL , +NO_BLOCK_MAPPINGS |NO_CONT_MAPPINGS ); +memblock_clear_nomap (crashk_res.start, +resource_size (&crashk_res)); + } + } +#endif }void mark_rodata_ro (void )
Greg Kroah-Hartman
maintainerPATCH 144/1126 drm/edid: check basic audio support on CEA extension block
In reply to Greg Kroah-HartmanFrom: Cooper Chiou <[email protected]>
commit 5662abf6e21338be6d085d6375d3732ac6147fd2 upstream.
Tag code stored in bit7:5 for CTA block byte[3] is not the same as CEA extension block definition. Only check CEA block has basic audio support.
v3: update commit message.
--- drivers/gpu/drm/drm_edid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_edid.c +2 -1
@@ -4848,7 +4848,8 @@ bool drm_detect_monitor_audio(struct ediif (!edid_ext) goto end; - has_audio = ((edid_ext[3 ] &EDID_BASIC_AUDIO ) !=0 ); + has_audio = (edid_ext[0 ] ==CEA_EXT && + (edid_ext[3 ] &EDID_BASIC_AUDIO ) !=0 );if (has_audio) {DRM_DEBUG_KMS ("Monitor has basic audio support\n" );
Greg Kroah-Hartman
maintainerPATCH 119/1126 PCI: fu740: Force 2.5GT/s for initial device probe
In reply to Greg Kroah-HartmanFrom: Ben Dooks <[email protected]>
commit a382c757ec5ef83137a86125f43a4c43dc2ab50b upstream.
The fu740 PCIe core does not probe any devices on the SiFive Unmatched board without this fix (or having U-Boot explicitly start the PCIe via either boot-script or user command). The fix is to start the link at 2.5GT/s speeds and once the link is up then change the maximum speed back to the default.
The U-Boot driver claims to set the link-speed to 2.5GT/s to get the probe to work (and U-Boot does print link up at 2.5GT/s) in the following code:
https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/pci/pcie_dw_sifive.c?id=v2022.01#L271
--- drivers/pci/controller/dwc/pcie-fu740.c | 51 +++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-fu740.c +50 -1
@@ -181,10 +181,59 @@ static int fu740_pcie_start_link(struct {struct device *dev = pci->dev;struct fu740_pcie *afp =dev_get_drvdata (dev); +u8 cap_exp =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); +int ret; +u32 orig, tmp; + +/* +* Force 2.5GT/s when starting the link, due to some devices not +* probing at higher speeds. This happens with the PCIe switch +* on the Unmatched board when U-Boot has not initialised the PCIe. +* The fix in U-Boot is to force 2.5GT/s, which then gets cleared +* by the soft reset done by this driver. +*/ +dev_dbg (dev,"cap_exp at %x\n" , cap_exp); +dw_pcie_dbi_ro_wr_en (pci); + + tmp =dw_pcie_readl_dbi (pci, cap_exp +PCI_EXP_LNKCAP ); + orig = tmp &PCI_EXP_LNKCAP_SLS ; + tmp &= ~PCI_EXP_LNKCAP_SLS ; + tmp |=PCI_EXP_LNKCAP_SLS_2_5GB ; +dw_pcie_writel_dbi (pci, cap_exp +PCI_EXP_LNKCAP , tmp);/* Enable LTSSM */ writel_relaxed (0x1 , afp->mgmt_base +PCIEX8MGMT_APP_LTSSM_ENABLE ); -return 0 ; + + ret =dw_pcie_wait_for_link (pci); +if (ret) { +dev_err (dev,"error: link did not start\n" ); + goto err; + } + + tmp =dw_pcie_readl_dbi (pci, cap_exp +PCI_EXP_LNKCAP ); +if ((tmp &PCI_EXP_LNKCAP_SLS ) != orig) { +dev_dbg (dev,"changing speed back to original\n" ); + + tmp &= ~PCI_EXP_LNKCAP_SLS ; + tmp |= orig; +dw_pcie_writel_dbi (pci, cap_exp +PCI_EXP_LNKCAP , tmp); + + tmp =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); + tmp |=PORT_LOGIC_SPEED_CHANGE ; +dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , tmp); + + ret =dw_pcie_wait_for_link (pci); +if (ret) { +dev_err (dev,"error: link did not start at new speed\n" ); + goto err; + } + } + + ret =0 ; +err: +WARN_ON (ret);/* we assume that errors will be very rare */ +dw_pcie_dbi_ro_wr_dis (pci); +return ret; }static int fu740_pcie_host_init (struct pcie_port *pp)
Greg Kroah-Hartman
maintainerPATCH 96/1126 ALSA: cs4236: fix an incorrect NULL check on list iterator
In reply to Greg Kroah-HartmanFrom: Xiaomeng Tong <[email protected]>
commit 0112f822f8a6d8039c94e0bc9b264d7ffc5d4704 upstream.
The bug is here:
err = snd_card_cs423x_pnp(dev, card->private_data, pdev, cdev);
The list iterator value 'cdev' will *always* be set and non-NULL by list_for_each_entry(), so it is incorrect to assume that the iterator value will be NULL if the list is empty or no element is found.
To fix the bug, use a new variable 'iter' as the list iterator, while use the original variable 'cdev' as a dedicated pointer to point to the found element. And snd_card_cs423x_pnp() itself has NULL check for cdev.
--- sound/isa/cs423x/cs4236.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/isa/cs423x/cs4236.c +5 -3
@@ -494,7 +494,7 @@ static int snd_cs423x_pnpbios_detect(strstatic int dev;int err;struct snd_card *card; -struct pnp_dev *cdev; +struct pnp_dev *cdev, *iter;char cid[PNP_ID_LEN ];if (pnp_device_is_isapnp (pdev))
@@ -510,9 +510,11 @@ static int snd_cs423x_pnpbios_detect(strstrcpy (cid, pdev->id[0 ].id); cid[5 ] ='1' ; cdev =NULL ; -list_for_each_entry (cdev, &(pdev->protocol->devices), protocol_list) { -if (!strcmp (cdev->id[0 ].id, cid)) +list_for_each_entry (iter, &(pdev->protocol->devices), protocol_list) { +if (!strcmp (iter->id[0 ].id, cid)) { + cdev = iter;break ; + } } err =snd_cs423x_card_new (&pdev->dev, dev, &card);if (err <0 )
Greg Kroah-Hartman
maintainerPATCH 110/1126 mm/kmemleak: reset tag when compare object pointer
In reply to Greg Kroah-HartmanFrom: Kuan-Ying Lee <[email protected]>
commit bfc8089f00fa526dea983844c880fa8106c33ac4 upstream.
When we use HW-tag based kasan and enable vmalloc support, we hit the following bug. It is due to comparison between tagged object and non-tagged pointer.
We need to reset the kasan tag when we need to compare tagged object and non-tagged pointer.
kmemleak: [name:kmemleak&]Scan area larger than object 0xffffffe77076f440
CPU: 4 PID: 1 Comm: init Tainted: G S W 5.15.25-android13-0-g5cacf919c2bc #1
Hardware name: MT6983(ENG) (DT)
Call trace:
add_scan_area+0xc4/0x244
kmemleak_scan_area+0x40/0x9c
layout_and_allocate+0x1e8/0x288
load_module+0x2c8/0xf00
__se_sys_finit_module+0x190/0x1d0
__arm64_sys_finit_module+0x20/0x30
invoke_syscall+0x60/0x170
el0_svc_common+0xc8/0x114
do_el0_svc+0x28/0xa0
el0_svc+0x60/0xf8
el0t_64_sync_handler+0x88/0xec
el0t_64_sync+0x1b4/0x1b8
kmemleak: [name:kmemleak&]Object 0xf5ffffe77076b000 (size 32768):
kmemleak: [name:kmemleak&] comm "init", pid 1, jiffies 4294894197
kmemleak: [name:kmemleak&] min_count = 0
kmemleak: [name:kmemleak&] count = 0
kmemleak: [name:kmemleak&] flags = 0x1
kmemleak: [name:kmemleak&] checksum = 0
kmemleak: [name:kmemleak&] backtrace:
module_alloc+0x9c/0x120
move_module+0x34/0x19c
layout_and_allocate+0x1c4/0x288
load_module+0x2c8/0xf00
__se_sys_finit_module+0x190/0x1d0
__arm64_sys_finit_module+0x20/0x30
invoke_syscall+0x60/0x170
el0_svc_common+0xc8/0x114
do_el0_svc+0x28/0xa0
el0_svc+0x60/0xf8
el0t_64_sync_handler+0x88/0xec
el0t_64_sync+0x1b4/0x1b8--- mm/kmemleak.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
mm/kmemleak.c +7 -2
@@ -796,6 +796,8 @@ static void add_scan_area(unsigned longunsigned long flags;struct kmemleak_object *object;struct kmemleak_scan_area *area =NULL ; +unsigned long untagged_ptr; +unsigned long untagged_objp; object =find_and_get_object (ptr,1 );if (!object) {
@@ -804,6 +806,9 @@ static void add_scan_area(unsigned longreturn ; } + untagged_ptr = (unsigned long )kasan_reset_tag ((void *)ptr); + untagged_objp = (unsigned long )kasan_reset_tag ((void *)object->pointer); +if (scan_area_cache) area =kmem_cache_alloc (scan_area_cache,gfp_kmemleak_mask (gfp));
@@ -815,8 +820,8 @@ static void add_scan_area(unsigned long goto out_unlock; }if (size ==SIZE_MAX ) { - size = object->pointer + object->size - ptr; - }else if (ptr + size > object->pointer + object->size) { + size = untagged_objp + object->size - untagged_ptr; + }else if (untagged_ptr + size > untagged_objp + object->size) {kmemleak_warn ("Scan area larger than object 0x%08lx\n" , ptr);dump_object_info (object);kmem_cache_free (scan_area_cache, area);
Greg Kroah-Hartman
maintainerPATCH 154/1126 mgag200 fix memmapsl configuration in GCTL6 register
In reply to Greg Kroah-HartmanFrom: Jocelyn Falempe <[email protected]>
commit 028a73e10705af1ffd51f2537460f616dc58680e upstream.
On some servers with MGA G200_SE_A (rev 42), booting with Legacy BIOS, the hardware hangs when using kdump and kexec into the kdump kernel. This happens when the uncompress code tries to write "Decompressing Linux" to the VGA Console.
It can be reproduced by writing to the VGA console (0xB8000) after booting to graphic mode, it generates the following error:
kernel:NMI: PCI system error (SERR) for reason a0 on CPU 0. kernel:Dazed and confused, but trying to continue
The root cause is the configuration of the MGA GCTL6 register
According to the GCTL6 register documentation:
bit 0 is gcgrmode:
0: Enables alpha mode, and the character generator addressing system is
activated.
1: Enables graphics mode, and the character addressing system is not
used.
bit 1 is chainodd even:
0: The A0 signal of the memory address bus is used during system memory
addressing.
1: Allows A0 to be replaced by either the A16 signal of the system
address (ifmemmapsl is ‘00’), or by the hpgoddev (MISC<5>, odd/even page select) field, described on page 3-294).
bit 3-2 are memmapsl:
Memory map select bits 1 and 0. VGA.
These bits select where the video memory is mapped, as shown below:
00 => A0000h - BFFFFh
01 => A0000h - AFFFFh
10 => B0000h - B7FFFh
11 => B8000h - BFFFFhbit 7-4 are reserved.
Current code set it to 0x05 => memmapsl to b01 => 0xa0000 (graphic mode) But on x86, the VGA console is at 0xb8000 (text mode)
In arch/x86/boot/compressed/misc.c debug strings are written to 0xb8000 As the driver doesn't use this mapping at 0xa0000, it is safe to set it to 0xb8000 instead, to avoid kernel hang on G200_SE_A rev42, with kexec/kdump.
Thus changing the value 0x05 to 0x0d
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +4 -1
@@ -529,7 +529,10 @@ static void mgag200_set_format_regs(struWREG_GFX (3 ,0x00 );WREG_GFX (4 ,0x00 );WREG_GFX (5 ,0x40 ); -WREG_GFX (6 ,0x05 ); +/* GCTL6 should be 0x05, but we configure memmapsl to 0xb8000 (text mode), +* so that it doesn't hang when running kexec/kdump on G200_SE rev42. +*/ +WREG_GFX (6 ,0x0d );WREG_GFX (7 ,0x0f );WREG_GFX (8 ,0x0f );
Greg Kroah-Hartman
maintainerPATCH 64/1126 pinctrl: ingenic: Fix regmap on X series SoCs
In reply to Greg Kroah-HartmanFrom: Aidan MacDonald <[email protected]>
commit 9279c00fa40250e5cb23a8423dce7dbc6516a0ea upstream.
The X series Ingenic SoCs have a shadow GPIO group which is at a higher offset than the other groups, and is used for all GPIO configuration. The regmap did not take this offset into account and set max_register too low, so the regmap API blocked writes to the shadow group, which made the pinctrl driver unable to configure any pins.
Fix this by adding regmap access tables to the chip info. The way that max_register was computed was also off by one, since max_register is an inclusive bound, not an exclusive bound; this has been fixed.
--- drivers/pinctrl/pinctrl-ingenic.c | 46 +++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-ingenic.c +45 -1
@@ -119,6 +119,8 @@ struct ingenic_chip_info {unsigned int num_functions;const u32 *pull_ups, *pull_downs; + +const struct regmap_access_table *access_table; };struct ingenic_pinctrl {
@@ -2179,6 +2181,17 @@ static const struct function_desc x1000_ { "mac", x1000_mac_groups, ARRAY_SIZE(x1000_mac_groups), }, }; +static const struct regmap_range x1000_access_ranges[] = { +regmap_reg_range (0x000 ,0x400 -4 ), +regmap_reg_range (0x700 ,0x800 -4 ), +}; + +/* shared with X1500 */ +static const struct regmap_access_table x1000_access_table = { + .yes_ranges = x1000_access_ranges, + .n_yes_ranges =ARRAY_SIZE (x1000_access_ranges), +}; +static const struct ingenic_chip_info x1000_chip_info = { .num_chips =4 , .reg_offset = 0x100,
@@ -2189,6 +2202,7 @@ static const struct ingenic_chip_info x1 .num_functions = ARRAY_SIZE(x1000_functions), .pull_ups = x1000_pull_ups, .pull_downs = x1000_pull_downs, + .access_table = &x1000_access_table, };static int x1500_uart0_data_pins[] = {0x4a ,0x4b , };
@@ -2300,6 +2314,7 @@ static const struct ingenic_chip_info x1 .num_functions = ARRAY_SIZE(x1500_functions), .pull_ups = x1000_pull_ups, .pull_downs = x1000_pull_downs, + .access_table = &x1000_access_table, };static const u32 x1830_pull_ups[4 ] = {
@@ -2506,6 +2521,16 @@ static const struct function_desc x1830_ { "mac", x1830_mac_groups, ARRAY_SIZE(x1830_mac_groups), }, }; +static const struct regmap_range x1830_access_ranges[] = { +regmap_reg_range (0x0000 ,0x4000 -4 ), +regmap_reg_range (0x7000 ,0x8000 -4 ), +}; + +static const struct regmap_access_table x1830_access_table = { + .yes_ranges = x1830_access_ranges, + .n_yes_ranges =ARRAY_SIZE (x1830_access_ranges), +}; +static const struct ingenic_chip_info x1830_chip_info = { .num_chips =4 , .reg_offset = 0x1000,
@@ -2516,6 +2541,7 @@ static const struct ingenic_chip_info x1 .num_functions = ARRAY_SIZE(x1830_functions), .pull_ups = x1830_pull_ups, .pull_downs = x1830_pull_downs, + .access_table = &x1830_access_table, };static const u32 x2000_pull_ups[5 ] = {
@@ -2969,6 +2995,17 @@ static const struct function_desc x2000_ { "otg", x2000_otg_groups, ARRAY_SIZE(x2000_otg_groups), }, }; +static const struct regmap_range x2000_access_ranges[] = { +regmap_reg_range (0x000 ,0x500 -4 ), +regmap_reg_range (0x700 ,0x800 -4 ), +}; + +/* shared with X2100 */ +static const struct regmap_access_table x2000_access_table = { + .yes_ranges = x2000_access_ranges, + .n_yes_ranges =ARRAY_SIZE (x2000_access_ranges), +}; +static const struct ingenic_chip_info x2000_chip_info = { .num_chips =5 , .reg_offset = 0x100,
@@ -2979,6 +3016,7 @@ static const struct ingenic_chip_info x2 .num_functions = ARRAY_SIZE(x2000_functions), .pull_ups = x2000_pull_ups, .pull_downs = x2000_pull_downs, + .access_table = &x2000_access_table, };static const u32 x2100_pull_ups[5 ] = {
@@ -3189,6 +3227,7 @@ static const struct ingenic_chip_info x2 .num_functions = ARRAY_SIZE(x2100_functions), .pull_ups = x2100_pull_ups, .pull_downs = x2100_pull_downs, + .access_table = &x2000_access_table, };static u32 ingenic_gpio_read_reg (struct ingenic_gpio_chip *jzgc,u8 reg)
@@ -4168,7 +4207,12 @@ static int __init ingenic_pinctrl_probe(return PTR_ERR (base); regmap_config = ingenic_pinctrl_regmap_config; - regmap_config.max_register = chip_info->num_chips * chip_info->reg_offset; +if (chip_info->access_table) { + regmap_config.rd_table = chip_info->access_table; + regmap_config.wr_table = chip_info->access_table; + }else { + regmap_config.max_register = chip_info->num_chips * chip_info->reg_offset -4 ; + } jzpc->map =devm_regmap_init_mmio (dev, base, ®map_config);if (IS_ERR (jzpc->map)) {
Greg Kroah-Hartman
maintainerPATCH 67/1126 spi: mxic: Fix the transmit path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 5fd6739e0df7e320bcac103dfb95fe75941fea17 upstream.
By working with external hardware ECC engines, we figured out that Under certain circumstances, it is needed for the SPI controller to check INT_TX_EMPTY and INT_RX_NOT_EMPTY in both receive and transmit path (not only in the receive path). The delay penalty being negligible, move this code in the common path.
--- drivers/spi/spi-mxic.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
drivers/spi/spi-mxic.c +11 -15
@@ -304,25 +304,21 @@ static int mxic_spi_data_xfer(struct mxiwritel (data, mxic->regs +TXD (nbytes %4 )); -if (rxbuf) { - ret =readl_poll_timeout (mxic->regs +INT_STS , sts, - sts &INT_TX_EMPTY ,0 , -USEC_PER_SEC ); -if (ret) -return ret; + ret =readl_poll_timeout (mxic->regs +INT_STS , sts, + sts &INT_TX_EMPTY ,0 ,USEC_PER_SEC ); +if (ret) +return ret; - ret =readl_poll_timeout (mxic->regs +INT_STS , sts, - sts &INT_RX_NOT_EMPTY ,0 , -USEC_PER_SEC ); -if (ret) -return ret; + ret =readl_poll_timeout (mxic->regs +INT_STS , sts, + sts &INT_RX_NOT_EMPTY ,0 , +USEC_PER_SEC ); +if (ret) +return ret; - data =readl (mxic->regs +RXD ); + data =readl (mxic->regs +RXD ); +if (rxbuf) { data >>= (8 * (4 - nbytes));memcpy (rxbuf + pos, &data, nbytes); -WARN_ON (readl (mxic->regs +INT_STS ) &INT_RX_NOT_EMPTY ); - }else { -readl (mxic->regs +RXD ); }WARN_ON (readl (mxic->regs +INT_STS ) &INT_RX_NOT_EMPTY );
Greg Kroah-Hartman
maintainerPATCH 74/1126 jffs2: fix memory leak in jffs2_do_mount_fs
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit d051cef784de4d54835f6b6836d98a8f6935772c upstream.
If jffs2_build_filesystem() in jffs2_do_mount_fs() returns an error, we can observe the following kmemleak report:
--------------------------------------------
unreferenced object 0xffff88811b25a640 (size 64):
comm "mount", pid 691, jiffies 4294957728 (age 71.952s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffffa493be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffa5423a06>] jffs2_sum_init+0x86/0x130
[<ffffffffa5400e58>] jffs2_do_mount_fs+0x798/0xac0
[<ffffffffa540acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffa540c00a>] jffs2_fill_super+0x2ea/0x4c0
[...]unreferenced object 0xffff88812c760000 (size 65536):
comm "mount", pid 691, jiffies 4294957728 (age 71.952s) hex dump (first 32 bytes):
bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................
backtrace:
[<ffffffffa493a449>] __kmalloc+0x6b9/0x910
[<ffffffffa5423a57>] jffs2_sum_init+0xd7/0x130
[<ffffffffa5400e58>] jffs2_do_mount_fs+0x798/0xac0
[<ffffffffa540acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffa540c00a>] jffs2_fill_super+0x2ea/0x4c0
[...]
--------------------------------------------This is because the resources allocated in jffs2_sum_init() are not released. Call jffs2_sum_exit() to release these resources to solve the problem.
--- fs/jffs2/build.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/jffs2/build.c +3 -1
@@ -415,13 +415,15 @@ int jffs2_do_mount_fs(struct jffs2_sb_injffs2_free_ino_caches (c);jffs2_free_raw_node_refs (c); ret = -EIO ; - goto out_free; + goto out_sum_exit; }jffs2_calc_trigger_levels (c);return 0 ; + out_sum_exit: +jffs2_sum_exit (c); out_free:kvfree (c->blocks);
Greg Kroah-Hartman
maintainerPATCH 77/1126 mm: dont skip swap entry even if zap_details specified
In reply to Greg Kroah-HartmanFrom: Peter Xu <[email protected]>
commit 5abfd71d936a8aefd9f9ccd299dea7a164a5d455 upstream.
Patch series "mm: Rework zap ptes on swap entries", v5.
Patch 1 should fix a long standing bug for zap_pte_range() on zap_details usage. The risk is we could have some swap entries skipped while we should have zapped them.
Migration entries are not the major concern because file backed memory always zap in the pattern that "first time without page lock, then re-zap with page lock" hence the 2nd zap will always make sure all migration entries are already recovered.
However there can be issues with real swap entries got skipped errornoously. There's a reproducer provided in commit message of patch 1 for that.
Patch 2-4 are cleanups that are based on patch 1. After the whole patchset applied, we should have a very clean view of zap_pte_range().
Only patch 1 needs to be backported to stable if necessary.
This patch (of 4):
The "details" pointer shouldn't be the token to decide whether we should skip swap entries.
For example, when the callers specified details->zap_mapping==NULL, it means the user wants to zap all the pages (including COWed pages), then we need to look into swap entries because there can be private COWed pages that was swapped out.
Skipping some swap entries when details is non-NULL may lead to wrongly leaving some of the swap entries while we should have zapped them.
A reproducer of the problem:
===8<===
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <stdio.h>
#include <assert.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/types.h>
int page_size;
int shmem_fd;
char *buffer;
void main(void)
{
int ret;
char val;
page_size = getpagesize();
shmem_fd = memfd_create("test", 0);
assert(shmem_fd >= 0);
ret = ftruncate(shmem_fd, page_size * 2);
assert(ret == 0);
buffer = mmap(NULL, page_size * 2, PROT_READ | PROT_WRITE,
MAP_PRIVATE, shmem_fd, 0);
assert(buffer != MAP_FAILED);
/* Write private page, swap it out */
buffer[page_size] = 1;
madvise(buffer, page_size * 2, MADV_PAGEOUT);
/* This should drop private buffer[page_size] already */
ret = ftruncate(shmem_fd, page_size);
assert(ret == 0);
/* Recover the size */
ret = ftruncate(shmem_fd, page_size * 2);
assert(ret == 0);
/* Re-read the data, it should be all zero */
val = buffer[page_size];
if (val == 0)
printf("Good\n");
else
printf("BUG\n");
}===8<===
We don't need to touch up the pmd path, because pmd never had a issue with swap entries. For example, shmem pmd migration will always be split into pte level, and same to swapping on anonymous.
Add another helper should_zap_cows() so that we can also check whether we should zap private mappings when there's no page pointer specified.
This patch drops that trick, so we handle swap ptes coherently. Meanwhile we should do the same check upon migration entry, hwpoison entry and genuine swap entries too.
To be explicit, we should still remember to keep the private entries if even_cows==false, and always zap them when even_cows==true.
The issue seems to exist starting from the initial commit of git.
--- mm/memory.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)
mm/memory.c +31 -9
@@ -1313,6 +1313,17 @@ struct zap_details {struct folio *single_folio;/* Locked folio to be unmapped */ }; +/* Whether we should zap all COWed (private) pages too */ +static inline bool should_zap_cows (struct zap_details *details) +{ +/* By default, zap all pages */ +if (!details) +return true; + +/* Or, we zap COWed pages only if the caller wants to */ +return !details->zap_mapping; +} +/* * We set details->zap_mapping when we want to unmap shared but keep private * pages. Return true if skip zapping this page, false otherwise.
@@ -1320,11 +1331,15 @@ struct zap_details {static inline bool zap_skip_check_mapping (struct zap_details *details,struct page *page) { -if (!details || !page) +/* If we can make a decision without *page.. */ +if (should_zap_cows (details)) +return false; + +/* E.g. the caller passes NULL for the case of a zero page */ +if (!page)return false; -return details->zap_mapping && - (details->zap_mapping !=page_rmapping (page)); +return details->zap_mapping !=page_rmapping (page); } static unsigned long zap_pte_range(struct mmu_gather *tlb,
@@ -1405,17 +1420,24 @@ again:continue ; } -/* If details->check_mapping, we leave swap entries. */ -if (unlikely (details)) -continue ; - -if (!non_swap_entry (entry)) +if (!non_swap_entry (entry)) { +/* Genuine swap entry, hence a private anon page */ +if (!should_zap_cows (details)) +continue ; rss[MM_SWAPENTS ]--; -else if (is_migration_entry (entry)) { + }else if (is_migration_entry (entry)) {struct page *page; page =pfn_swap_entry_to_page (entry); +if (zap_skip_check_mapping (details, page)) +continue ; rss[mm_counter (page)]--; + }else if (is_hwpoison_entry (entry)) { +if (!should_zap_cows (details)) +continue ; + }else { +/* We should have covered all the swap entry types */ +WARN_ON_ONCE (1 ); }if (unlikely (!free_swap_and_cache (entry)))print_bad_pte (vma, addr, ptent,NULL );
Greg Kroah-Hartman
maintainerPATCH 93/1126 cifs: fix incorrect use of list iterator after the loop
In reply to Greg Kroah-HartmanFrom: Xiaomeng Tong <[email protected]>
commit a96c94481f5993eac2271f9fb4d009b7dc076c24 upstream.
The bug is here:
if (!tcon) {
resched = true;
list_del_init(&ses->rlist);
cifs_put_smb_ses(ses);Because the list_for_each_entry() never exits early (without any break/goto/return inside the loop), the iterator 'ses' after the loop will always be an pointer to a invalid struct containing the HEAD (&pserver->smb_ses_list). As a result, the uses of 'ses' above will lead to a invalid memory access.
The original intention should have been to walk each entry 'ses' in '&tmp_ses_list', delete '&ses->rlist' and put 'ses'. So fix it with a list_for_each_entry_safe().
--- fs/cifs/smb2pdu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/cifs/smb2pdu.c +4 -2
@@ -3858,8 +3858,10 @@ void smb2_reconnect_server(struct work_s tcon =kzalloc (sizeof (struct cifs_tcon ),GFP_KERNEL );if (!tcon) { resched = true; -list_del_init (&ses->rlist); -cifs_put_smb_ses (ses); +list_for_each_entry_safe (ses, ses2, &tmp_ses_list, rlist) { +list_del_init (&ses->rlist); +cifs_put_smb_ses (ses); + } goto done; }
Greg Kroah-Hartman
maintainerPATCH 153/1126 ARM: dts: exynos: add missing HDMI supplies on SMDK5420
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 453a24ded415f7fce0499c6b0a2c7b28f84911f2 upstream.
Add required VDD supplies to HDMI block on SMDK5420. Without them, the HDMI driver won't probe. Because of lack of schematics, use same supplies as on Arndale Octa and Odroid XU3 boards (voltage matches).
--- arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/exynos5420-smdk5420.dts +3 -0
@@ -124,6 +124,9 @@ hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_hpd_irq>; + vdd-supply = <&ldo6_reg>; + vdd_osc-supply = <&ldo7_reg>; + vdd_pll-supply = <&ldo6_reg>; }; &hsi2c_4 {
Greg Kroah-Hartman
maintainerPATCH 68/1126 mtd: spi-nor: Skip erase logic when SPI_NOR_NO_ERASE is set
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
commit 151c6b49d679872d6fc0b50e0ad96303091694a2 upstream.
Even if SPI_NOR_NO_ERASE was set, one could still send erase opcodes to the flash. It is not recommended to send unsupported opcodes to flashes. Fix the logic and do not set mtd->_erase when SPI_NOR_NO_ERASE is specified. With this users will not be able to issue erase opcodes to flashes and instead they will recive an -ENOTSUPP error.
--- drivers/mtd/spi-nor/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/core.c +2 -1
@@ -3181,10 +3181,11 @@ static void spi_nor_set_mtd_info(struct mtd->flags =MTD_CAP_NORFLASH ;if (nor->info->flags &SPI_NOR_NO_ERASE ) mtd->flags |=MTD_NO_ERASE ; +else + mtd->_erase = spi_nor_erase; mtd->writesize = nor->params->writesize; mtd->writebufsize = nor->params->page_size; mtd->size = nor->params->size; - mtd->_erase = spi_nor_erase; mtd->_read = spi_nor_read;/* Might be already set by some SST flashes. */ if (!mtd->_write)
Greg Kroah-Hartman
maintainerPATCH 169/1126 media: venus: vdec: fixed possible memory leak issue
In reply to Greg Kroah-HartmanFrom: Ameer Hamza <[email protected]>
commit 8403fdd775858a7bf04868d43daea0acbe49ddfc upstream.
The venus_helper_alloc_dpb_bufs() implementation allows an early return on an error path when checking the id from ida_alloc_min() which would not release the earlier buffer allocation.
Move the direct kfree() from the error checking of dma_alloc_attrs() to the common fail path to ensure that allocations are released on all error paths in this function.
Addresses-Coverity: 1494120 ("Resource leak")
--- drivers/media/platform/qcom/venus/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/helpers.c +1 -1
@@ -189,7 +189,6 @@ int venus_helper_alloc_dpb_bufs(struct v buf->va =dma_alloc_attrs (dev, buf->size, &buf->da,GFP_KERNEL , buf->attrs);if (!buf->va) { -kfree (buf); ret = -ENOMEM ; goto fail; }
@@ -209,6 +208,7 @@ int venus_helper_alloc_dpb_bufs(struct vreturn 0 ; fail: +kfree (buf);venus_helper_free_dpb_bufs (inst);return ret; }
Greg Kroah-Hartman
maintainerPATCH 124/1126 arm64: dts: ti: k3-j721e: Fix gic-v3 compatible regs
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
commit a06ed27f3bc63ab9e10007dc0118d910908eb045 upstream.
Though GIC ARE option is disabled for no GIC-v2 compatibility, Cortex-A72 is free to implement the CPU interface as long as it communicates with the GIC using the stream protocol. This requires that the SoC integration mark out the PERIPHBASE[1] as reserved area within the SoC. See longer discussion in [2] for further information.
Update the GIC register map to indicate offsets from PERIPHBASE based on [3]. Without doing this, systems like kvm will not function with gic-v2 emulation.
[1] https://developer.arm.com/documentation/100095/0002/system-control/aarch64-register-descriptions/configuration-base-address-register--el1
[2] https://lore.kernel.org/all/[email protected]/
[3] https://developer.arm.com/documentation/100095/0002/way1382452674438
--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 5 ++++- arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +4 -1
@@ -76,7 +76,10 @@ #interrupt-cells = <3>; interrupt-controller; reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */ - <0x00 0x01900000 0x00 0x100000>; /* GICR */ + <0x00 0x01900000 0x00 0x100000>, /* GICR */ + <0x00 0x6f000000 0x00 0x2000>, /* GICC */ + <0x00 0x6f010000 0x00 0x1000>, /* GICH */ + <0x00 0x6f020000 0x00 0x2000>; /* GICV */ /* vcpumntirq: virtual CPU interface maintenance interrupt */ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
arch/arm64/boot/dts/ti/k3-j721e.dtsi +1 -0
@@ -139,6 +139,7 @@ <0x00 0x0e000000 0x00 0x0e000000 0x00 0x01800000>, /* PCIe Core*/ <0x00 0x10000000 0x00 0x10000000 0x00 0x10000000>, /* PCIe DAT */ <0x00 0x64800000 0x00 0x64800000 0x00 0x00800000>, /* C71 */ + <0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A72 PERIPHBASE */ <0x44 0x00000000 0x44 0x00000000 0x00 0x08000000>, /* PCIe2 DAT */ <0x44 0x10000000 0x44 0x10000000 0x00 0x08000000>, /* PCIe3 DAT */ <0x4d 0x80800000 0x4d 0x80800000 0x00 0x00800000>, /* C66_0 */
Greg Kroah-Hartman
maintainerPATCH 63/1126 mm/mlock: fix two bugs in user_shm_lock()
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit e97824ff663ce3509fe040431c713182c2f058b1 upstream.
user_shm_lock forgets to set allowed to 0 when get_ucounts fails. So the later user_shm_unlock might do the extra dec_rlimit_ucounts. Also in the RLIM_INFINITY case, user_shm_lock will success regardless of the value of memlock where memblock == LONG_MAX && !capable(CAP_IPC_LOCK) should fail. Fix all of these by changing the code to leave lock_limit at ULONG_MAX aka RLIM_INFINITY, leave "allowed" initialized to 0 and remove the special case of RLIM_INFINITY as nothing can be greater than ULONG_MAX.
Credit goes to Eric W. Biederman for proposing simplifying the code and thus catching the later bug.
v1: https://lkml.kernel.org/r/[email protected]
v2: https://lkml.kernel.org/r/[email protected]
--- mm/mlock.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
mm/mlock.c +3 -4
@@ -827,13 +827,12 @@ int user_shm_lock(size_t size, struct uc locked = (size +PAGE_SIZE -1 ) >>PAGE_SHIFT ; lock_limit =rlimit (RLIMIT_MEMLOCK ); -if (lock_limit ==RLIM_INFINITY ) - allowed =1 ; - lock_limit >>=PAGE_SHIFT ; +if (lock_limit !=RLIM_INFINITY ) + lock_limit >>=PAGE_SHIFT ;spin_lock (&shmlock_user_lock); memlock =inc_rlimit_ucounts (ucounts,UCOUNT_RLIMIT_MEMLOCK , locked); -if (!allowed && (memlock ==LONG_MAX || memlock > lock_limit) && !capable (CAP_IPC_LOCK )) { +if ((memlock ==LONG_MAX || memlock > lock_limit) && !capable (CAP_IPC_LOCK )) {dec_rlimit_ucounts (ucounts,UCOUNT_RLIMIT_MEMLOCK , locked); goto out; }
Greg Kroah-Hartman
maintainerPATCH 118/1126 can: isotp: sanitize CAN ID checks in isotp_bind()
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
commit 3ea566422cbde9610c2734980d1286ab681bb40e upstream.
Syzbot created an environment that lead to a state machine status that can not be reached with a compliant CAN ID address configuration. The provided address information consisted of CAN ID 0x6000001 and 0xC28001 which both boil down to 11 bit CAN IDs 0x001 in sending and receiving.
Sanitize the SFF/EFF CAN ID values before performing the address checks.
--- net/can/isotp.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-)
net/can/isotp.c +20 -18
@@ -1104,6 +1104,7 @@ static int isotp_bind(struct socket *socstruct net *net =sock_net (sk);int ifindex;struct net_device *dev; +canid_t tx_id, rx_id;int err =0 ;int notify_enetdown =0 ;int do_rx_reg =1 ;
@@ -1111,8 +1112,18 @@ static int isotp_bind(struct socket *socif (len <ISOTP_MIN_NAMELEN )return -EINVAL ; -if (addr->can_addr.tp.tx_id & (CAN_ERR_FLAG |CAN_RTR_FLAG )) -return -EADDRNOTAVAIL ; +/* sanitize tx/rx CAN identifiers */ + tx_id = addr->can_addr.tp.tx_id; +if (tx_id &CAN_EFF_FLAG ) + tx_id &= (CAN_EFF_FLAG |CAN_EFF_MASK ); +else + tx_id &=CAN_SFF_MASK ; + + rx_id = addr->can_addr.tp.rx_id; +if (rx_id &CAN_EFF_FLAG ) + rx_id &= (CAN_EFF_FLAG |CAN_EFF_MASK ); +else + rx_id &=CAN_SFF_MASK ;if (!addr->can_ifindex)return -ENODEV ;
@@ -1124,21 +1135,13 @@ static int isotp_bind(struct socket *soc do_rx_reg =0 ;/* do not validate rx address for functional addressing */ -if (do_rx_reg) { -if (addr->can_addr.tp.rx_id == addr->can_addr.tp.tx_id) { - err = -EADDRNOTAVAIL ; - goto out; - } - -if (addr->can_addr.tp.rx_id & (CAN_ERR_FLAG |CAN_RTR_FLAG )) { - err = -EADDRNOTAVAIL ; - goto out; - } +if (do_rx_reg && rx_id == tx_id) { + err = -EADDRNOTAVAIL ; + goto out; }if (so->bound && addr->can_ifindex == so->ifindex && - addr->can_addr.tp.rx_id == so->rxid && - addr->can_addr.tp.tx_id == so->txid) + rx_id == so->rxid && tx_id == so->txid) goto out; dev =dev_get_by_index (net, addr->can_ifindex);
@@ -1162,8 +1165,7 @@ static int isotp_bind(struct socket *soc ifindex = dev->ifindex;if (do_rx_reg) -can_rx_register (net, dev, addr->can_addr.tp.rx_id, -SINGLE_MASK (addr->can_addr.tp.rx_id), +can_rx_register (net, dev, rx_id,SINGLE_MASK (rx_id), isotp_rcv, sk,"isotp" , sk);dev_put (dev);
@@ -1183,8 +1185,8 @@ static int isotp_bind(struct socket *soc/* switch to new settings */ so->ifindex = ifindex; - so->rxid = addr->can_addr.tp.rx_id; - so->txid = addr->can_addr.tp.tx_id; + so->rxid = rx_id; + so->txid = tx_id; so->bound =1 ; out:
Greg Kroah-Hartman
maintainerPATCH 56/1126 NFS: NFSv2/v3 clients should never be setting NFS_CAP_XATTR
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit b622ffe1d9ecbac71f0cddb52ff0831efdf8fb83 upstream.
Ensure that we always initialise the 'xattr_support' field in struct nfs_fsinfo, so that nfs_server_set_fsinfo() doesn't declare our NFSv2/v3 client to be capable of supporting the NFSv4.2 xattr protocol by setting the NFS_CAP_XATTR capability.
This configuration can cause nfs_do_access() to set access mode bits that are unsupported by the NFSv3 ACCESS call, which may confuse spec-compliant servers.
--- fs/nfs/nfs3xdr.c | 1 + fs/nfs/proc.c | 1 + 2 files changed, 2 insertions(+)
fs/nfs/nfs3xdr.c +1 -0
@@ -2228,6 +2228,7 @@ static int decode_fsinfo3resok(struct xd/* ignore properties */ result->lease_time =0 ; result->change_attr_type =NFS4_CHANGE_TYPE_IS_UNDEFINED ; + result->xattr_support =0 ;return 0 ; }
fs/nfs/proc.c +1 -0
@@ -92,6 +92,7 @@ nfs_proc_get_root(struct nfs_server *ser info->maxfilesize =0x7FFFFFFF ; info->lease_time =0 ; info->change_attr_type =NFS4_CHANGE_TYPE_IS_UNDEFINED ; + info->xattr_support =0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 140/1126 btrfs: zoned: put block group after final usage
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
commit d3e29967079c522ce1c5cab0e9fab2c280b977eb upstream.
It's counter-intuitive (and wrong) to put the block group _before_ the final usage in submit_eb_page. Fix it by re-ordering the call to btrfs_put_block_group after its final reference. Also fix a minor typo in 'implies'
--- fs/btrfs/extent_io.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/extent_io.c +4 -3
@@ -4780,11 +4780,12 @@ static int submit_eb_page(struct page *preturn ret; }if (cache) { -/* Impiles write in zoned mode */ -btrfs_put_block_group (cache); -/* Mark the last eb in a block group */ +/* +* Implies write in zoned mode. Mark the last eb in a block group. +*/ if (cache->seq_zone && eb->start + eb->len == cache->zone_capacity)set_bit (EXTENT_BUFFER_ZONE_FINISH , &eb->bflags); +btrfs_put_block_group (cache); } ret =write_one_eb (eb, wbc, epd);free_extent_buffer (eb);
Greg Kroah-Hartman
maintainerPATCH 107/1126 Revert "mm: madvise: skip unmapped vma holes passed to process_madvise"
In reply to Greg Kroah-HartmanFrom: Charan Teja Kalla <[email protected]>
commit e6b0a7b357659c332231621e4315658d062c23ee upstream.
This reverts commit 08095d6310a7 ("mm: madvise: skip unmapped vma holes passed to process_madvise") as process_madvise() fails to return the exact processed bytes in other cases too.
As an example: if process_madvise() hits mlocked pages after processing some initial bytes passed in [start, end), it just returns EINVAL although some bytes are processed. Thus making an exception only for ENOMEM is partially fixing the problem of returning the proper advised bytes.
Thus revert this patch and return proper bytes advised.
--- mm/madvise.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
mm/madvise.c +1 -8
@@ -1426,16 +1426,9 @@ SYSCALL_DEFINE5(process_madvise, int, piwhile (iov_iter_count (&iter)) { iovec =iov_iter_iovec (&iter); -/* -* do_madvise returns ENOMEM if unmapped holes are present -* in the passed VMA. process_madvise() is expected to skip -* unmapped holes passed to it in the 'struct iovec' list -* and not fail because of them. Thus treat -ENOMEM return -* from do_madvise as valid and continue processing. -*/ ret =do_madvise (mm, (unsigned long )iovec.iov_base, iovec.iov_len, behavior); -if (ret <0 && ret != -ENOMEM ) +if (ret <0 )break ;iov_iter_advance (&iter, iovec.iov_len); }
Greg Kroah-Hartman
maintainerPATCH 69/1126 mtd: rawnand: protect access to rawnand devices while in suspend
In reply to Greg Kroah-HartmanFrom: Sean Nyekjaer <[email protected]>
commit 8cba323437a49a45756d661f500b324fc2d486fe upstream.
Prevent rawnand access while in a suspended state.
Commit 013e6292aaf5 ("mtd: rawnand: Simplify the locking") allows the rawnand layer to return errors rather than waiting in a blocking wait.
Tested on a iMX6ULL.
--- drivers/mtd/nand/raw/nand_base.c | 44 +++++++++++++++++---------------------- include/linux/mtd/rawnand.h | 2 + 2 files changed, 22 insertions(+), 24 deletions(-)
drivers/mtd/nand/raw/nand_base.c +20 -24
@@ -338,16 +338,19 @@ static int nand_isbad_bbm(struct nand_ch* * Return: -EBUSY if the chip has been suspended, 0 otherwise */ -static int nand_get_device (struct nand_chip *chip) +static void nand_get_device (struct nand_chip *chip) { -mutex_lock (&chip->lock); -if (chip->suspended) { +/* Wait until the device is resumed. */ +while (1 ) { +mutex_lock (&chip->lock); +if (!chip->suspended) { +mutex_lock (&chip->controller->lock); +return ; + }mutex_unlock (&chip->lock); -return -EBUSY ; - } -mutex_lock (&chip->controller->lock); -return 0 ; +wait_event (chip->resume_wq, !chip->suspended); + } }/**
@@ -576,9 +579,7 @@ static int nand_block_markbad_lowlevel(snand_erase_nand (chip, &einfo,0 );/* Write bad block marker to OOB */ - ret =nand_get_device (chip); -if (ret) -return ret; +nand_get_device (chip); ret =nand_markbad_bbm (chip, ofs);nand_release_device (chip);
@@ -3826,9 +3827,7 @@ static int nand_read_oob(struct mtd_info ops->mode != MTD_OPS_RAW)return -ENOTSUPP ; - ret =nand_get_device (chip); -if (ret) -return ret; +nand_get_device (chip);if (!ops->datbuf) ret =nand_do_read_oob (chip, from, ops);
@@ -4415,13 +4414,11 @@ static int nand_write_oob(struct mtd_inf struct mtd_oob_ops *ops) {struct nand_chip *chip =mtd_to_nand (mtd); -int ret; +int ret =0 ; ops->retlen =0 ; - ret =nand_get_device (chip); -if (ret) -return ret; +nand_get_device (chip);switch (ops->mode) {case MTD_OPS_PLACE_OOB :
@@ -4481,9 +4478,7 @@ int nand_erase_nand(struct nand_chip *chreturn -EIO ;/* Grab the lock and see if the device is available */ - ret =nand_get_device (chip); -if (ret) -return ret; +nand_get_device (chip);/* Shift to get first page */ page = (int )(instr->addr >> chip->page_shift);
@@ -4570,7 +4565,7 @@ static void nand_sync(struct mtd_info *mpr_debug ("%s: called\n" , __func__);/* Grab the lock and see if the device is available */ -WARN_ON (nand_get_device (chip)); +nand_get_device (chip);/* Release it and go back */ nand_release_device (chip); }
@@ -4587,9 +4582,7 @@ static int nand_block_isbad(struct mtd_iint ret;/* Select the NAND device */ - ret =nand_get_device (chip); -if (ret) -return ret; +nand_get_device (chip);nand_select_target (chip, chipnr);
@@ -4660,6 +4653,8 @@ static void nand_resume(struct mtd_info __func__); }mutex_unlock (&chip->lock); + +wake_up_all (&chip->resume_wq); }/**
@@ -5437,6 +5432,7 @@ static int nand_scan_ident(struct nand_c chip->cur_cs =-1 ;mutex_init (&chip->lock); +init_waitqueue_head (&chip->resume_wq);/* Enforce the right timings for reset/detection */ chip->current_interface_config =nand_get_reset_interface_config ();
include/linux/mtd/rawnand.h +2 -0
@@ -1240,6 +1240,7 @@ struct nand_secure_region {* @lock: Lock protecting the suspended field. Also used to serialize accesses * to the NAND device * @suspended: Set to 1 when the device is suspended, 0 when it's not +* @resume_wq: wait queue to sleep if rawnand is in suspended state. * @cur_cs: Currently selected target. -1 means no target selected, otherwise we * should always have cur_cs >= 0 && cur_cs < nanddev_ntargets(). * NAND Controller drivers should not modify this value, but they're
@@ -1294,6 +1295,7 @@ struct nand_chip {/* Internals */ struct mutex lock; unsigned int suspended : 1; +wait_queue_head_t resume_wq;int cur_cs;int read_retries;struct nand_secure_region *secure_regions;
Greg Kroah-Hartman
maintainerPATCH 160/1126 crypto: rsa-pkcs1pad - only allow with rsa
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 9b30430ea356f237945e52f8a3a42158877bd5a9 upstream.
The pkcs1pad template can be instantiated with an arbitrary akcipher algorithm, which doesn't make sense; it is specifically an RSA padding scheme. Make it check that the underlying algorithm really is RSA.
--- crypto/rsa-pkcs1pad.c | 5 +++++ 1 file changed, 5 insertions(+)
crypto/rsa-pkcs1pad.c +5 -0
@@ -621,6 +621,11 @@ static int pkcs1pad_create(struct crypto rsa_alg =crypto_spawn_akcipher_alg (&ctx->spawn); +if (strcmp (rsa_alg->base.cra_name,"rsa" ) !=0 ) { + err = -EINVAL ; + goto err_free_inst; + } + err = -ENAMETOOLONG ; hash_name =crypto_attr_alg_name (tb[2 ]);if (IS_ERR (hash_name)) {
Greg Kroah-Hartman
maintainerPATCH 94/1126 cifs: prevent bad output lengths in smb2_ioctl_query_info()
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit b92e358757b91c2827af112cae9af513f26a3f34 upstream.
When calling smb2_ioctl_query_info() with smb_query_info::flags=PASSTHRU_FSCTL and smb_query_info::output_buffer_length=0, the following would return 0x10
buffer = memdup_user(arg + sizeof(struct smb_query_info),
qi.output_buffer_length);
if (IS_ERR(buffer)) {
kfree(vars);
return PTR_ERR(buffer);
}rather than a valid pointer thus making IS_ERR() check fail. This would then cause a NULL ptr deference in @buffer when accessing it later in smb2_ioctl_query_ioctl(). While at it, prevent having a @buffer smaller than 8 bytes to correctly handle SMB2_SET_INFO FileEndOfFileInformation requests when smb_query_info::flags=PASSTHRU_SET_INFO.
Here is a small C reproducer which triggers a NULL ptr in @buffer when passing an invalid smb_query_info::flags
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#define die(s) perror(s), exit(1)
#define QUERY_INFO 0xc018cf07
int main(int argc, char *argv[])
{
int fd;
if (argc < 2)
exit(1);
fd = open(argv[1], O_RDONLY);
if (fd == -1)
die("open");
if (ioctl(fd, QUERY_INFO, (uint32_t[]) { 0, 0, 0, 4, 0, 0}) == -1)
die("ioctl");
close(fd);
return 0;
}
mount.cifs //srv/share /mnt -o ...
gcc repro.c && ./a.out /mnt/f0
[ 114.138620] general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN NOPTI
[ 114.139310] KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
[ 114.139775] CPU: 2 PID: 995 Comm: a.out Not tainted 5.17.0-rc8 #1
[ 114.140148] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.15.0-0-g2dd4b9b-rebuilt.opensuse.org 04/01/2014
[ 114.140818] RIP: 0010:smb2_ioctl_query_info+0x206/0x410 [cifs]
[ 114.141221] Code: 00 00 00 00 fc ff df 48 c1 ea 03 80 3c 02 00 0f 85 c8 01 00 00 48 b8 00 00 00 00 00 fc ff df 4c 8b 7b 28 4c 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 9c 01 00 00 49 8b 3f e8 58 02 fb ff 48 8b 14 24
[ 114.142348] RSP: 0018:ffffc90000b47b00 EFLAGS: 00010256
[ 114.142692] RAX: dffffc0000000000 RBX: ffff888115503200 RCX: ffffffffa020580d
[ 114.143119] RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffffa043a380
[ 114.143544] RBP: ffff888115503278 R08: 0000000000000001 R09: 0000000000000003
[ 114.143983] R10: fffffbfff4087470 R11: 0000000000000001 R12: ffff888115503288
[ 114.144424] R13: 00000000ffffffea R14: ffff888115503228 R15: 0000000000000000
[ 114.144852] FS: 00007f7aeabdf740(0000) GS:ffff888151600000(0000) knlGS:0000000000000000
[ 114.145338] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 114.145692] CR2: 00007f7aeacfdf5e CR3: 000000012000e000 CR4: 0000000000350ee0
[ 114.146131] Call Trace:
[ 114.146291] <TASK>
[ 114.146432] ? smb2_query_reparse_tag+0x890/0x890 [cifs]
[ 114.146800] ? cifs_mapchar+0x460/0x460 [cifs]
[ 114.147121] ? rcu_read_lock_sched_held+0x3f/0x70
[ 114.147412] ? cifs_strndup_to_utf16+0x15b/0x250 [cifs]
[ 114.147775] ? dentry_path_raw+0xa6/0xf0
[ 114.148024] ? cifs_convert_path_to_utf16+0x198/0x220 [cifs]
[ 114.148413] ? smb2_check_message+0x1080/0x1080 [cifs]
[ 114.148766] ? rcu_read_lock_sched_held+0x3f/0x70
[ 114.149065] cifs_ioctl+0x1577/0x3320 [cifs]
[ 114.149371] ? lock_downgrade+0x6f0/0x6f0
[ 114.149631] ? cifs_readdir+0x2e60/0x2e60 [cifs]
[ 114.149956] ? rcu_read_lock_sched_held+0x3f/0x70
[ 114.150250] ? __rseq_handle_notify_resume+0x80b/0xbe0
[ 114.150562] ? __up_read+0x192/0x710
[ 114.150791] ? __ia32_sys_rseq+0xf0/0xf0
[ 114.151025] ? __x64_sys_openat+0x11f/0x1d0
[ 114.151296] __x64_sys_ioctl+0x127/0x190
[ 114.151549] do_syscall_64+0x3b/0x90
[ 114.151768] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 114.152079] RIP: 0033:0x7f7aead043df
[ 114.152306] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00
[ 114.153431] RSP: 002b:00007ffc2e0c1f80 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
[ 114.153890] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f7aead043df
[ 114.154315] RDX: 00007ffc2e0c1ff0 RSI: 00000000c018cf07 RDI: 0000000000000003
[ 114.154747] RBP: 00007ffc2e0c2010 R08: 00007f7aeae03db0 R09: 00007f7aeae24c4e
[ 114.155192] R10: 00007f7aeabf7d40 R11: 0000000000000246 R12: 00007ffc2e0c2128
[ 114.155642] R13: 0000000000401176 R14: 0000000000403df8 R15: 00007f7aeae57000
[ 114.156071] </TASK>
[ 114.156218] Modules linked in: cifs cifs_arc4 cifs_md4 bpf_preload
[ 114.156608] ---[ end trace 0000000000000000 ]---
[ 114.156898] RIP: 0010:smb2_ioctl_query_info+0x206/0x410 [cifs]
[ 114.157792] Code: 00 00 00 00 fc ff df 48 c1 ea 03 80 3c 02 00 0f 85 c8 01 00 00 48 b8 00 00 00 00 00 fc ff df 4c 8b 7b 28 4c 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 9c 01 00 00 49 8b 3f e8 58 02 fb ff 48 8b 14 24
[ 114.159293] RSP: 0018:ffffc90000b47b00 EFLAGS: 00010256
[ 114.159641] RAX: dffffc0000000000 RBX: ffff888115503200 RCX: ffffffffa020580d
[ 114.160093] RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffffa043a380
[ 114.160699] RBP: ffff888115503278 R08: 0000000000000001 R09: 0000000000000003
[ 114.161196] R10: fffffbfff4087470 R11: 0000000000000001 R12: ffff888115503288
[ 114.155642] R13: 0000000000401176 R14: 0000000000403df8 R15: 00007f7aeae57000
[ 114.156071] </TASK>
[ 114.156218] Modules linked in: cifs cifs_arc4 cifs_md4 bpf_preload
[ 114.156608] ---[ end trace 0000000000000000 ]---
[ 114.156898] RIP: 0010:smb2_ioctl_query_info+0x206/0x410 [cifs]
[ 114.157792] Code: 00 00 00 00 fc ff df 48 c1 ea 03 80 3c 02 00 0f 85 c8 01 00 00 48 b8 00 00 00 00 00 fc ff df 4c 8b 7b 28 4c 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 9c 01 00 00 49 8b 3f e8 58 02 fb ff 48 8b 14 24
[ 114.159293] RSP: 0018:ffffc90000b47b00 EFLAGS: 00010256
[ 114.159641] RAX: dffffc0000000000 RBX: ffff888115503200 RCX: ffffffffa020580d
[ 114.160093] RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffffa043a380
[ 114.160699] RBP: ffff888115503278 R08: 0000000000000001 R09: 0000000000000003
[ 114.161196] R10: fffffbfff4087470 R11: 0000000000000001 R12: ffff888115503288
[ 114.161823] R13: 00000000ffffffea R14: ffff888115503228 R15: 0000000000000000
[ 114.162274] FS: 00007f7aeabdf740(0000) GS:ffff888151600000(0000) knlGS:0000000000000000
[ 114.162853] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 114.163218] CR2: 00007f7aeacfdf5e CR3: 000000012000e000 CR4: 0000000000350ee0
[ 114.163691] Kernel panic - not syncing: Fatal exception
[ 114.164087] Kernel Offset: disabled
[ 114.164316] ---[ end Kernel panic - not syncing: Fatal exception ]------ fs/cifs/smb2ops.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
fs/cifs/smb2ops.c +10 -6
@@ -1668,11 +1668,12 @@ smb2_ioctl_query_info(const unsigned intif (smb3_encryption_required (tcon)) flags |=CIFS_TRANSFORM_REQ ; - buffer =memdup_user (arg +sizeof (struct smb_query_info ), - qi.output_buffer_length); -if (IS_ERR (buffer)) { -kfree (vars); -return PTR_ERR (buffer); +if (qi.output_buffer_length) { + buffer =memdup_user (arg +sizeof (struct smb_query_info ), qi.output_buffer_length); +if (IS_ERR (buffer)) { +kfree (vars); +return PTR_ERR (buffer); + } }/* Open */
@@ -1735,10 +1736,13 @@ smb2_ioctl_query_info(const unsigned int/* Can eventually relax perm check since server enforces too */ if (!capable (CAP_SYS_ADMIN )) rc = -EPERM ; -else { +else if (qi.output_buffer_length <8 ) + rc = -EINVAL ; +else { rqst[1 ].rq_iov = &vars->si_iov[0 ]; rqst[1 ].rq_nvec =1 ; +/* MS-FSCC 2.4.13 FileEndOfFileInformation */ size[0 ] =8 ; data[0 ] = buffer;
Greg Kroah-Hartman
maintainerPATCH 55/1126 SUNRPC: Do not dereference non-socket transports in sysfs
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit 421ab1be43bd015ffe744f4ea25df4f19d1ce6fe upstream.
Do not cast the struct xprt to a sock_xprt unless we know it is a UDP or TCP transport. Otherwise the call to lock the mutex will scribble over whatever structure is actually there. This has been seen to cause hard system lockups when the underlying transport was RDMA.
--- include/linux/sunrpc/xprt.h | 3 ++ include/linux/sunrpc/xprtsock.h | 1 net/sunrpc/sysfs.c | 55 +++++++++++++++++++--------------------- net/sunrpc/xprtsock.c | 26 +++++++++++++++++- 4 files changed, 54 insertions(+), 31 deletions(-)
include/linux/sunrpc/xprt.h +3 -0
@@ -139,6 +139,9 @@ struct rpc_xprt_ops {void (*rpcbind)(struct rpc_task *task);void (*set_port)(struct rpc_xprt *xprt,unsigned short port);void (*connect)(struct rpc_xprt *xprt,struct rpc_task *task); +int (*get_srcaddr)(struct rpc_xprt *xprt,char *buf, +size_t buflen); +unsigned short (*get_srcport)(struct rpc_xprt *xprt);int (*buf_alloc)(struct rpc_task *task);void (*buf_free)(struct rpc_task *task);void (*prepare_request)(struct rpc_rqst *req);
include/linux/sunrpc/xprtsock.h +0 -1
@@ -10,7 +10,6 @@int init_socket_xprt (void );void cleanup_socket_xprt (void ); -unsigned short get_srcport (struct rpc_xprt *);#define RPC_MIN_RESVPORT (1U)#define RPC_MAX_RESVPORT (65535U)
net/sunrpc/sysfs.c +27 -28
102 lines not on this page · raw message
net/sunrpc/xprtsock.c +24 -2
@@ -1638,7 +1638,7 @@ static int xs_get_srcport(struct sock_xpreturn port; } -unsigned short get_srcport (struct rpc_xprt *xprt) +static unsigned short xs_sock_srcport (struct rpc_xprt *xprt) { struct sock_xprt *sock = container_of(xprt, struct sock_xprt, xprt);unsigned short ret =0 ;
@@ -1648,7 +1648,25 @@ unsigned short get_srcport(struct rpc_xpmutex_unlock (&sock->recv_mutex);return ret; } -EXPORT_SYMBOL (get_srcport); + +static int xs_sock_srcaddr (struct rpc_xprt *xprt,char *buf,size_t buflen) +{ + struct sock_xprt *sock = container_of(xprt, struct sock_xprt, xprt); +union { +struct sockaddr sa; +struct sockaddr_storage st; + } saddr; +int ret = -ENOTCONN ; + +mutex_lock (&sock->recv_mutex); +if (sock->sock) { + ret =kernel_getsockname (sock->sock, &saddr.sa); +if (ret >=0 ) + ret =snprintf (buf, buflen,"%pISc" , &saddr.sa); + } +mutex_unlock (&sock->recv_mutex); +return ret; +}static unsigned short xs_next_srcport (struct sock_xprt *transport,unsigned short port) {
@@ -2621,6 +2639,8 @@ static const struct rpc_xprt_ops xs_udp_ .rpcbind = rpcb_getport_async, .set_port = xs_set_port, .connect = xs_connect, + .get_srcaddr = xs_sock_srcaddr, + .get_srcport = xs_sock_srcport, .buf_alloc = rpc_malloc, .buf_free = rpc_free, .send_request = xs_udp_send_request,
@@ -2643,6 +2663,8 @@ static const struct rpc_xprt_ops xs_tcp_ .rpcbind = rpcb_getport_async, .set_port = xs_set_port, .connect = xs_connect, + .get_srcaddr = xs_sock_srcaddr, + .get_srcport = xs_sock_srcport, .buf_alloc = rpc_malloc, .buf_free = rpc_free, .prepare_request = xs_stream_prepare_request,
Greg Kroah-Hartman
maintainerPATCH 115/1126 dm integrity: set journal entry unused when shrinking device
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit cc09e8a9dec4f0e8299e80a7a2a8e6f54164a10b upstream.
Commit f6f72f32c22c ("dm integrity: don't replay journal data past the end of the device") skips journal replay if the target sector points beyond the end of the device. Unfortunatelly, it doesn't set the journal entry unused, which resulted in this BUG being triggered:
BUG_ON(!journal_entry_is_unused(je))
Fix this by calling journal_entry_set_unused() for this case.
--- drivers/md/dm-integrity.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/md/dm-integrity.c +4 -2
@@ -2473,9 +2473,11 @@ static void do_journal_write(struct dm_idm_integrity_io_error (ic,"invalid sector in journal" , -EIO ); sec &= ~(sector_t)(ic->sectors_per_block -1 ); } +if (unlikely (sec >= ic->provided_data_sectors)) { +journal_entry_set_unused (je); +continue ; + } } -if (unlikely (sec >= ic->provided_data_sectors)) -continue ;get_area_and_offset (ic, sec, &area, &offset);restore_last_bytes (ic,access_journal_data (ic, i, j), je);for (k = j +1 ; k < ic->journal_section_entries; k++) {
Greg Kroah-Hartman
maintainerPATCH 132/1126 coredump: Also dump first pages of non-executable ELF libraries
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 84158b7f6a0624b81800b4e7c90f7fb7fdecf66c upstream.
When I rewrote the VMA dumping logic for coredumps, I changed it to recognize ELF library mappings based on the file being executable instead of the mapping having an ELF header. But turns out, distros ship many ELF libraries as non-executable, so the heuristic goes wrong...
Restore the old behavior where FILTER(ELF_HEADERS) dumps the first page of any offset-0 readable mapping that starts with the ELF magic.
This fix is technically layer-breaking a bit, because it checks for something ELF-specific in fs/coredump.c; but since we probably want to share this between standard ELF and FDPIC ELF anyway, I guess it's fine? And this also keeps the change small for backporting.
--- fs/coredump.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-)
fs/coredump.c +34 -5
@@ -42,6 +42,7 @@#include <linux/path.h> #include <linux/timekeeping.h> #include <linux/sysctl.h> +#include <linux/elf.h> #include <linux/uaccess.h> #include <asm/mmu_context.h>
@@ -980,6 +981,8 @@ static bool always_dump_vma(struct vm_arreturn false; } +#define DUMP_SIZE_MAYBE_ELFHDR_PLACEHOLDER 1 +/* * Decide how much of @vma's contents should be included in a core dump. */
@@ -1039,9 +1042,20 @@ static unsigned long vma_dump_size(struc* dump the first page to aid in determining what was mapped here. */ if (FILTER (ELF_HEADERS ) && - vma->vm_pgoff ==0 && (vma->vm_flags &VM_READ ) && - (READ_ONCE (file_inode (vma->vm_file)->i_mode) &0111 ) !=0 ) -return PAGE_SIZE ; + vma->vm_pgoff ==0 && (vma->vm_flags &VM_READ )) { +if ((READ_ONCE (file_inode (vma->vm_file)->i_mode) &0111 ) !=0 ) +return PAGE_SIZE ; + +/* +* ELF libraries aren't always executable. +* We'll want to check whether the mapping starts with the ELF +* magic, but not now - we're holding the mmap lock, +* so copy_from_user() doesn't work here. +* Use a placeholder instead, and fix it up later in +* dump_vma_snapshot(). +*/ +return DUMP_SIZE_MAYBE_ELFHDR_PLACEHOLDER ; + }#undef FILTER
@@ -1116,8 +1130,6 @@ int dump_vma_snapshot(struct coredump_pa m->end = vma->vm_end; m->flags = vma->vm_flags; m->dump_size =vma_dump_size (vma, cprm->mm_flags); - - vma_data_size += m->dump_size; }mmap_write_unlock (mm);
@@ -1127,6 +1139,23 @@ int dump_vma_snapshot(struct coredump_pareturn -EFAULT ; } +for (i =0 ; i < *vma_count; i++) { +struct core_vma_metadata *m = (*vma_meta) + i; + +if (m->dump_size ==DUMP_SIZE_MAYBE_ELFHDR_PLACEHOLDER ) { +char elfmag[SELFMAG ]; + +if (copy_from_user (elfmag, (void __user *)m->start,SELFMAG ) || +memcmp (elfmag,ELFMAG ,SELFMAG ) !=0 ) { + m->dump_size =0 ; + }else { + m->dump_size =PAGE_SIZE ; + } + } + + vma_data_size += m->dump_size; + } + *vma_data_size_ptr = vma_data_size;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 92/1126 cifs: do not skip link targets when an I/O fails
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 5d7e282541fc91b831a5c4477c5d72881c623df9 upstream.
When I/O fails in one of the currently connected DFS targets, retry it from other targets as specified in MS-DFSC "3.1.5.2 I/O Operation to +Target Fails with an Error Other Than STATUS_PATH_NOT_COVERED."
--- fs/cifs/connect.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
fs/cifs/connect.c +11 -3
@@ -3473,6 +3473,9 @@ static int connect_dfs_target(struct moustruct cifs_sb_info *cifs_sb = mnt_ctx->cifs_sb;char *oldmnt = cifs_sb->ctx->mount_options; +cifs_dbg (FYI ,"%s: full_path=%s ref_path=%s target=%s\n" , __func__, full_path, ref_path, +dfs_cache_get_tgt_name (tit)); + rc =dfs_cache_get_tgt_referral (ref_path, tit, &ref);if (rc) goto out;
@@ -3571,13 +3574,18 @@ static int __follow_dfs_link(struct mounif (rc) goto out; -/* Try all dfs link targets */ +/* Try all dfs link targets. If an I/O fails from currently connected DFS target with an +* error other than STATUS_PATH_NOT_COVERED (-EREMOTE), then retry it from other targets as +* specified in MS-DFSC "3.1.5.2 I/O Operation to Target Fails with an Error Other Than +* STATUS_PATH_NOT_COVERED." +*/ for (rc = -ENOENT , tit =dfs_cache_get_tgt_iterator (&tl); tit; tit =dfs_cache_get_next_tgt (&tl, tit)) { rc =connect_dfs_target (mnt_ctx, full_path, mnt_ctx->leaf_fullpath +1 , tit);if (!rc) { rc =is_path_remote (mnt_ctx); -break ; +if (!rc || rc == -EREMOTE ) +break ; } }
@@ -3651,7 +3659,7 @@ int cifs_mount(struct cifs_sb_info *cifs goto error; rc =is_path_remote (&mnt_ctx); -if (rc == -EREMOTE ) +if (rc) rc =follow_dfs_link (&mnt_ctx);if (rc) goto error;
Greg Kroah-Hartman
maintainerPATCH 171/1126 media: venus: venc: Fix h264 8x8 transform control
In reply to Greg Kroah-HartmanFrom: Stanimir Varbanov <[email protected]>
commit 61b3317dd424a3488b6754d7ff8301944d9d17d7 upstream.
During encoder driver open controls are initialized via a call to v4l2_ctrl_handler_setup which returns EINVAL error for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM v4l2 control. The control default value is disabled and because of firmware limitations 8x8 transform cannot be disabled for the supported HIGH and CONSTRAINED_HIGH profiles.
To fix the issue change the control default value to enabled (this is fine because the firmware enables 8x8 transform for high and constrained_high profiles by default). Also, correct the checking of profile ids in s_ctrl from hfi to v4l2 ids.
--- drivers/media/platform/qcom/venus/venc.c | 4 ++-- drivers/media/platform/qcom/venus/venc_ctrls.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/media/platform/qcom/venus/venc.c +2 -2
@@ -662,8 +662,8 @@ static int venc_set_properties(struct ve ptype =HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8 ; h264_transform.enable_type =0 ; -if (ctr->profile.h264 ==HFI_H264_PROFILE_HIGH || - ctr->profile.h264 ==HFI_H264_PROFILE_CONSTRAINED_HIGH ) +if (ctr->profile.h264 ==V4L2_MPEG_VIDEO_H264_PROFILE_HIGH || + ctr->profile.h264 ==V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH ) h264_transform.enable_type = ctr->h264_8x8_transform; ret =hfi_session_set_property (inst, ptype, &h264_transform);
drivers/media/platform/qcom/venus/venc_ctrls.c +3 -3
@@ -320,8 +320,8 @@ static int venc_op_s_ctrl(struct v4l2_ct ctr->intra_refresh_period = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM : -if (ctr->profile.h264 !=HFI_H264_PROFILE_HIGH && - ctr->profile.h264 !=HFI_H264_PROFILE_CONSTRAINED_HIGH ) +if (ctr->profile.h264 !=V4L2_MPEG_VIDEO_H264_PROFILE_HIGH && + ctr->profile.h264 !=V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH )return -EINVAL ;/*
@@ -457,7 +457,7 @@ int venc_ctrl_init(struct venus_inst *in V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP, 1, 51, 1, 1);v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM ,0 ,1 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM ,0 ,1 ,1 ,1 );v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP ,1 ,51 ,1 ,1 );
Greg Kroah-Hartman
maintainerPATCH 149/1126 ARM: dts: at91: sama7g5: Remove unused properties in i2c nodes
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
commit cbb92a7717d2e1c512b7e81c6b22c7298b58a881 upstream.
The "atmel,use-dma-rx", "atmel,use-dma-rx" dt properties are not used by the i2c-at91 driver, nor they are defined in the bindings file, thus remove them.
--- arch/arm/boot/dts/sama7g5.dtsi | 6 ------ 1 file changed, 6 deletions(-)
arch/arm/boot/dts/sama7g5.dtsi +0 -6
@@ -382,8 +382,6 @@ dmas = <&dma0 AT91_XDMAC_DT_PERID(7)>, <&dma0 AT91_XDMAC_DT_PERID(8)>; dma-names = "rx", "tx"; - atmel,use-dma-rx; - atmel,use-dma-tx; status = "disabled"; }; };
@@ -558,8 +556,6 @@ dmas = <&dma0 AT91_XDMAC_DT_PERID(21)>, <&dma0 AT91_XDMAC_DT_PERID(22)>; dma-names = "rx", "tx"; - atmel,use-dma-rx; - atmel,use-dma-tx; status = "disabled"; }; };
@@ -584,8 +580,6 @@ dmas = <&dma0 AT91_XDMAC_DT_PERID(23)>, <&dma0 AT91_XDMAC_DT_PERID(24)>; dma-names = "rx", "tx"; - atmel,use-dma-rx; - atmel,use-dma-tx; status = "disabled"; }; };
Greg Kroah-Hartman
maintainerPATCH 75/1126 jffs2: fix memory leak in jffs2_scan_medium
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit 9cdd3128874f5fe759e2c4e1360ab7fb96a8d1df upstream.
If an error is returned in jffs2_scan_eraseblock() and some memory has been added to the jffs2_summary *s, we can observe the following kmemleak report:
--------------------------------------------
unreferenced object 0xffff88812b889c40 (size 64):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s) hex dump (first 32 bytes):
40 48 b5 14 81 88 ff ff 01 e0 31 00 00 00 50 00 @H........1...P.
00 00 01 00 00 00 01 00 00 00 02 00 00 00 09 08 ................
backtrace:
[<ffffffffae93a3a3>] __kmalloc+0x613/0x910
[<ffffffffaf423b9c>] jffs2_sum_add_dirent_mem+0x5c/0xa0
[<ffffffffb0f3afa8>] jffs2_scan_medium.cold+0x36e5/0x4794
[<ffffffffb0f3dbe1>] jffs2_do_mount_fs.cold+0xa7/0x2267
[<ffffffffaf40acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffaf40c00a>] jffs2_fill_super+0x2ea/0x4c0
[<ffffffffb0315d64>] mtd_get_sb+0x254/0x400
[<ffffffffb0315f5f>] mtd_get_sb_by_nr+0x4f/0xd0
[<ffffffffb0316478>] get_tree_mtd+0x498/0x840
[<ffffffffaf40bd15>] jffs2_get_tree+0x25/0x30
[<ffffffffae9f358d>] vfs_get_tree+0x8d/0x2e0
[<ffffffffaea7a98f>] path_mount+0x50f/0x1e50
[<ffffffffaea7c3d7>] do_mount+0x107/0x130
[<ffffffffaea7c5c5>] __se_sys_mount+0x1c5/0x2f0
[<ffffffffaea7c917>] __x64_sys_mount+0xc7/0x160
[<ffffffffb10142f5>] do_syscall_64+0x45/0x70
unreferenced object 0xffff888114b54840 (size 32):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s)
hex dump (first 32 bytes):
c0 75 b5 14 81 88 ff ff 02 e0 02 00 00 00 02 00 .u..............
00 00 84 00 00 00 44 00 00 00 6b 6b 6b 6b 6b a5 ......D...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423b04>] jffs2_sum_add_inode_mem+0x54/0x90
[<ffffffffb0f3bd44>] jffs2_scan_medium.cold+0x4481/0x4794
[...]
unreferenced object 0xffff888114b57280 (size 32):
comm "mount", pid 692, jiffies 4294838393 (age 34.357s)
hex dump (first 32 bytes):
10 d5 6c 11 81 88 ff ff 08 e0 05 00 00 00 01 00 ..l.............
00 00 38 02 00 00 28 00 00 00 6b 6b 6b 6b 6b a5 ..8...(...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423c34>] jffs2_sum_add_xattr_mem+0x54/0x90
[<ffffffffb0f3a24f>] jffs2_scan_medium.cold+0x298c/0x4794
[...]
unreferenced object 0xffff8881116cd510 (size 16):
comm "mount", pid 692, jiffies 4294838395 (age 34.355s)
hex dump (first 16 bytes):
00 00 00 00 00 00 00 00 09 e0 60 02 00 00 6b a5 ..........`...k.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423cc4>] jffs2_sum_add_xref_mem+0x54/0x90
[<ffffffffb0f3b2e3>] jffs2_scan_medium.cold+0x3a20/0x4794
[...]
--------------------------------------------Therefore, we should call jffs2_sum_reset_collected(s) on exit to release the memory added in s. In addition, a new tag "out_buf" is added to prevent the NULL pointer reference caused by s being NULL. (thanks to Zhang Yi for this analysis)
Co-developed-with: Zhihao Cheng <[email protected]>
--- fs/jffs2/scan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/jffs2/scan.c +4 -2
@@ -136,7 +136,7 @@ int jffs2_scan_medium(struct jffs2_sb_inif (!s) {JFFS2_WARNING ("Can't allocate memory for summary\n" ); ret = -ENOMEM ; - goto out; + goto out_buf; } }
@@ -275,13 +275,15 @@ int jffs2_scan_medium(struct jffs2_sb_in } ret =0 ; out: +jffs2_sum_reset_collected (s); +kfree (s); + out_buf:if (buf_size)kfree (flashbuf);#ifndef __ECOS else mtd_unpoint(c->mtd, 0, c->mtd->size);#endif -kfree (s);return ret; }
Greg Kroah-Hartman
maintainerPATCH 167/1126 media: gpio-ir-tx: fix transmit with long spaces on Orange Pi PC
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit 5ad05ecad4326ddaa26a83ba2233a67be24c1aaa upstream.
Calling udelay for than 1000us does not always yield the correct results.
--- drivers/media/rc/gpio-ir-tx.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)
drivers/media/rc/gpio-ir-tx.c +21 -7
@@ -48,11 +48,29 @@ static int gpio_ir_tx_set_carrier(structreturn 0 ; } +static void delay_until (ktime_t until) +{ +/* +* delta should never exceed 0.5 seconds (IR_MAX_DURATION) and on +* m68k ndelay(s64) does not compile; so use s32 rather than s64. +*/ +s32 delta; + +while (true) { + delta =ktime_us_delta (until,ktime_get ()); +if (delta <=0 ) +return ; + +/* udelay more than 1ms may not work */ + delta =min (delta,1000 ); +udelay (delta); + } +} +static void gpio_ir_tx_unmodulated (struct gpio_ir *gpio_ir,uint *txbuf,uint count) {ktime_t edge; -s32 delta;int i;local_irq_disable ();
@@ -63,9 +81,7 @@ static void gpio_ir_tx_unmodulated(strucgpiod_set_value (gpio_ir->gpio, !(i %2 )); edge =ktime_add_us (edge, txbuf[i]); - delta =ktime_us_delta (edge,ktime_get ()); -if (delta >0 ) -udelay (delta); +delay_until (edge); }gpiod_set_value (gpio_ir->gpio,0 );
@@ -97,9 +113,7 @@ static void gpio_ir_tx_modulated(structif (i %2 ) {// space edge =ktime_add_us (edge, txbuf[i]); - delta =ktime_us_delta (edge,ktime_get ()); -if (delta >0 ) -udelay (delta); +delay_until (edge); }else {// pulse ktime_t last =ktime_add_us (edge, txbuf[i]);
Greg Kroah-Hartman
maintainerPATCH 87/1126 riscv: dts: canaan: Fix SPI3 bus width
In reply to Greg Kroah-HartmanFrom: Niklas Cassel <[email protected]>
commit 6846d656106add3aeefcd6eda0dc885787deaa6e upstream.
According to the K210 Standalone SDK Programming guide:
https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_standalone_programming_guide_20190311144158_en.pdf
Section 15.4.3.3:
SPI0 and SPI1 supports: standard, dual, quad and octal transfers. SPI3 supports: standard, dual and quad transfers (octal is not supported).
In order to support quad transfers (Quad SPI), SPI3 must have four IO wires connected to the SPI flash.
Update the device tree to specify the correct bus width.
Tested on maix bit, maix dock and maixduino, which all have the same SPI flash (gd25lq128d) connected to SPI3. maix go is untested, but it would not make sense for this k210 board to be designed differently.
--- arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 ++ arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 ++ arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 ++ arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 ++ 4 files changed, 8 insertions(+)
arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts +2 -0
@@ -203,6 +203,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; };
arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts +2 -0
@@ -205,6 +205,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; };
arch/riscv/boot/dts/canaan/sipeed_maix_go.dts +2 -0
@@ -213,6 +213,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; };
arch/riscv/boot/dts/canaan/sipeed_maixduino.dts +2 -0
@@ -178,6 +178,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; };
Greg Kroah-Hartman
maintainerPATCH 111/1126 dm stats: fix too short end duration_ns when using precise_timestamps
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 0cdb90f0f306384ecbc60dfd6dc48cdbc1f2d0d8 upstream.
dm_stats_account_io()'s STAT_PRECISE_TIMESTAMPS support doesn't handle the fact that with commit b879f915bc48 ("dm: properly fix redundant bio-based IO accounting") io->start_time _may_ be in the past (meaning the start_io_acct() was deferred until later).
Add a new dm_stats_recalc_precise_timestamps() helper that will set/clear a new 'precise_timestamps' flag in the dm_stats struct based on whether any configured stats enable STAT_PRECISE_TIMESTAMPS. And update DM core's alloc_io() to use dm_stats_record_start() to set stats_aux.duration_ns if stats->precise_timestamps is true.
Also, remove unused 'last_sector' and 'last_rw' members from the dm_stats struct.
--- drivers/md/dm-stats.c | 28 +++++++++++++++++++++++++--- drivers/md/dm-stats.h | 9 +++++++-- drivers/md/dm.c | 2 ++ 3 files changed, 34 insertions(+), 5 deletions(-)
drivers/md/dm-stats.c +25 -3
@@ -195,6 +195,7 @@ void dm_stats_init(struct dm_stats *statmutex_init (&stats->mutex);INIT_LIST_HEAD (&stats->list); + stats->precise_timestamps = false; stats->last = alloc_percpu(struct dm_stats_last_position);for_each_possible_cpu (cpu) { last =per_cpu_ptr (stats->last, cpu);
@@ -231,6 +232,22 @@ void dm_stats_cleanup(struct dm_stats *smutex_destroy (&stats->mutex); } +static void dm_stats_recalc_precise_timestamps (struct dm_stats *stats) +{ +struct list_head *l; +struct dm_stat *tmp_s; +bool precise_timestamps = false; + +list_for_each (l, &stats->list) { + tmp_s = container_of(l, struct dm_stat, list_entry); +if (tmp_s->stat_flags &STAT_PRECISE_TIMESTAMPS ) { + precise_timestamps = true; +break ; + } + } + stats->precise_timestamps = precise_timestamps; +} + static int dm_stats_create(struct dm_stats *stats, sector_t start, sector_t end, sector_t step, unsigned stat_flags, unsigned n_histogram_entries,
@@ -376,6 +393,9 @@ static int dm_stats_create(struct dm_sta } ret_id = s->id;list_add_tail_rcu (&s->list_entry, l); + +dm_stats_recalc_precise_timestamps (stats); +mutex_unlock (&stats->mutex);resume_callback (md);
@@ -418,6 +438,9 @@ static int dm_stats_delete(struct dm_sta }list_del_rcu (&s->list_entry); + +dm_stats_recalc_precise_timestamps (stats); +mutex_unlock (&stats->mutex);/*
@@ -654,9 +677,8 @@ void dm_stats_account_io(struct dm_stats got_precise_time = false;list_for_each_entry_rcu (s, &stats->list, list_entry) {if (s->stat_flags &STAT_PRECISE_TIMESTAMPS && !got_precise_time) { -if (!end) - stats_aux->duration_ns =ktime_to_ns (ktime_get ()); -else +/* start (!end) duration_ns is set by DM core's alloc_io() */ +if (end) stats_aux->duration_ns =ktime_to_ns (ktime_get ()) - stats_aux->duration_ns; got_precise_time = true; }
drivers/md/dm-stats.h +7 -2
@@ -13,8 +13,7 @@ struct dm_stats {struct mutex mutex;struct list_head list;/* list of struct dm_stat */ struct dm_stats_last_position __percpu *last; -sector_t last_sector; -unsigned last_rw; +bool precise_timestamps; };struct dm_stats_aux {
@@ -40,4 +39,10 @@ static inline bool dm_stats_used(struct return !list_empty(&st->list); } +static inline void dm_stats_record_start (struct dm_stats *stats,struct dm_stats_aux *aux) +{ +if (unlikely (stats->precise_timestamps)) + aux->duration_ns =ktime_to_ns (ktime_get ()); +} +#endif
drivers/md/dm.c +2 -0
@@ -537,6 +537,8 @@ static struct dm_io *alloc_io(struct map io->start_time = jiffies; +dm_stats_record_start (&md->stats, &io->stats_aux); +return io; }
Greg Kroah-Hartman
maintainerPATCH 73/1126 jffs2: fix use-after-free in jffs2_clear_xattr_subsystem
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit 4c7c44ee1650677fbe89d86edbad9497b7679b5c upstream.
When we mount a jffs2 image, assume that the first few blocks of the image are normal and contain at least one xattr-related inode, but the next block is abnormal. As a result, an error is returned in jffs2_scan_eraseblock(). jffs2_clear_xattr_subsystem() is then called in jffs2_build_filesystem() and then again in jffs2_do_fill_super().
Finally we can observe the following report:
==================================================================
BUG: KASAN: use-after-free in jffs2_clear_xattr_subsystem+0x95/0x6ac Read of size 8 at addr ffff8881243384e0 by task mount/719 Call Trace: dump_stack+0x115/0x16b jffs2_clear_xattr_subsystem+0x95/0x6ac jffs2_do_fill_super+0x84f/0xc30 jffs2_fill_super+0x2ea/0x4c0 mtd_get_sb+0x254/0x400 mtd_get_sb_by_nr+0x4f/0xd0 get_tree_mtd+0x498/0x840 jffs2_get_tree+0x25/0x30 vfs_get_tree+0x8d/0x2e0 path_mount+0x50f/0x1e50 do_mount+0x107/0x130 __se_sys_mount+0x1c5/0x2f0 __x64_sys_mount+0xc7/0x160 do_syscall_64+0x45/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Allocated by task 719: kasan_save_stack+0x23/0x60 __kasan_kmalloc.constprop.0+0x10b/0x120 kasan_slab_alloc+0x12/0x20 kmem_cache_alloc+0x1c0/0x870 jffs2_alloc_xattr_ref+0x2f/0xa0 jffs2_scan_medium.cold+0x3713/0x4794 jffs2_do_mount_fs.cold+0xa7/0x2253 jffs2_do_fill_super+0x383/0xc30 jffs2_fill_super+0x2ea/0x4c0 [...] Freed by task 719: kmem_cache_free+0xcc/0x7b0 jffs2_free_xattr_ref+0x78/0x98 jffs2_clear_xattr_subsystem+0xa1/0x6ac jffs2_do_mount_fs.cold+0x5e6/0x2253 jffs2_do_fill_super+0x383/0xc30 jffs2_fill_super+0x2ea/0x4c0 [...] The buggy address belongs to the object at ffff8881243384b8 which belongs to the cache jffs2_xattr_ref of size 48 The buggy address is located 40 bytes inside of 48-byte region [ffff8881243384b8, ffff8881243384e8) [...] ==================================================================
The triggering of the BUG is shown in the following stack:
-----------------------------------------------------------jffs2_fill_super
jffs2_do_fill_super
jffs2_do_mount_fs
jffs2_build_filesystem
jffs2_scan_medium
jffs2_scan_eraseblock <--- ERROR
jffs2_clear_xattr_subsystem <--- free
jffs2_clear_xattr_subsystem <--- free again
-----------------------------------------------------------
An error is returned in jffs2_do_mount_fs(). If the error is returned by jffs2_sum_init(), the jffs2_clear_xattr_subsystem() does not need to be executed. If the error is returned by jffs2_build_filesystem(), the jffs2_clear_xattr_subsystem() also does not need to be executed again. So move jffs2_clear_xattr_subsystem() from 'out_inohash' to 'out_root' to fix this UAF problem.
--- fs/jffs2/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jffs2/fs.c +1 -1
@@ -603,8 +603,8 @@ out_root:jffs2_free_ino_caches (c);jffs2_free_raw_node_refs (c);kvfree (c->blocks); - out_inohash:jffs2_clear_xattr_subsystem (c); + out_inohash:kfree (c->inocache_list); out_wbuf:jffs2_flash_cleanup (c);
Greg Kroah-Hartman
maintainerPATCH 78/1126 mm/pages_alloc.c: dont create ZONE_MOVABLE beyond the end of a node
In reply to Greg Kroah-HartmanFrom: Alistair Popple <[email protected]>
commit ddbc84f3f595cf1fc8234a191193b5d20ad43938 upstream.
ZONE_MOVABLE uses the remaining memory in each node. Its starting pfn is also aligned to MAX_ORDER_NR_PAGES. It is possible for the remaining memory in a node to be less than MAX_ORDER_NR_PAGES, meaning there is not enough room for ZONE_MOVABLE on that node.
Unfortunately this condition is not checked for. This leads to zone_movable_pfn[] getting set to a pfn greater than the last pfn in a node.
calculate_node_totalpages() then sets zone->present_pages to be greater than zone->spanned_pages which is invalid, as spanned_pages represents the maximum number of pages in a zone assuming no holes.
Subsequently it is possible free_area_init_core() will observe a zone of size zero with present pages. In this case it will skip setting up the zone, including the initialisation of free_lists[].
However populated_zone() checks zone->present_pages to see if a zone has memory available. This is used by iterators such as walk_zones_in_node(). pagetypeinfo_showfree() uses this to walk the free_list of each zone in each node, which are assumed to be initialised due to the zone not being empty.
As free_area_init_core() never initialised the free_lists[] this results in the following kernel crash when trying to read /proc/pagetypeinfo:
BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC NOPTI CPU: 0 PID: 456 Comm: cat Not tainted 5.16.0 #461 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 RIP: 0010:pagetypeinfo_show+0x163/0x460 Code: 9e 82 e8 80 57 0e 00 49 8b 06 b9 01 00 00 00 4c 39 f0 75 16 e9 65 02 00 00 48 83 c1 01 48 81 f9 a0 86 01 00 0f 84 48 02 00 00 <48> 8b 00 4c 39 f0 75 e7 48 c7 c2 80 a2 e2 82 48 c7 c6 79 ef e3 82 RSP: 0018:ffffc90001c4bd10 EFLAGS: 00010003 RAX: 0000000000000000 RBX: ffff88801105f638 RCX: 0000000000000001 RDX: 0000000000000001 RSI: 000000000000068b RDI: ffff8880163dc68b RBP: ffffc90001c4bd90 R08: 0000000000000001 R09: ffff8880163dc67e R10: 656c6261766f6d6e R11: 6c6261766f6d6e55 R12: ffff88807ffb4a00 R13: ffff88807ffb49f8 R14: ffff88807ffb4580 R15: ffff88807ffb3000 FS: 00007f9c83eff5c0(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000000013c8e000 CR4: 0000000000350ef0 Call Trace: seq_read_iter+0x128/0x460 proc_reg_read_iter+0x51/0x80 new_sync_read+0x113/0x1a0 vfs_read+0x136/0x1d0 ksys_read+0x70/0xf0 __x64_sys_read+0x1a/0x20 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae
Fix this by checking that the aligned zone_movable_pfn[] does not exceed the end of the node, and if it does skip creating a movable zone on this node.
--- mm/page_alloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
mm/page_alloc.c +8 -1
@@ -7972,10 +7972,17 @@ restart: out2:/* Align start of ZONE_MOVABLE on all nids to MAX_ORDER_NR_PAGES */ -for (nid =0 ; nid <MAX_NUMNODES ; nid++) +for (nid =0 ; nid <MAX_NUMNODES ; nid++) { +unsigned long start_pfn, end_pfn; + zone_movable_pfn[nid] =roundup (zone_movable_pfn[nid],MAX_ORDER_NR_PAGES ); +get_pfn_range_for_nid (nid, &start_pfn, &end_pfn); +if (zone_movable_pfn[nid] >= end_pfn) + zone_movable_pfn[nid] =0 ; + } + out:/* restore the node_state */ node_states[N_MEMORY ] = saved_node_state;
Greg Kroah-Hartman
maintainerPATCH 156/1126 pstore: Dont use semaphores in always-atomic-context code
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 8126b1c73108bc691f5643df19071a59a69d0bc6 upstream.
pstore_dump() is *always* invoked in atomic context (nowadays in an RCU read-side critical section, before that under a spinlock). It doesn't make sense to try to use semaphores here.
This is mostly a revert of commit ea84b580b955 ("pstore: Convert buf_lock to semaphore"), except that two parts aren't restored back exactly as they were:
- keep the lock initialization in pstore_register
- in efi_pstore_write(), always set the "block" flag to false
- omit "is_locked", that was unnecessary since
commit 959217c84c27 ("pstore: Actually give up during locking failure")
- fix the bailout message
The actual problem that the buggy commit was trying to address may have been that the use of preemptible() in efi_pstore_write() was wrong - it only looks at preempt_count() and the state of IRQs, but __rcu_read_lock() doesn't touch either of those under CONFIG_PREEMPT_RCU. (Sidenote: CONFIG_PREEMPT_RCU means that the scheduler can preempt tasks in RCU read-side critical sections, but you're not allowed to actively block/reschedule.)
Lockdep probably never caught the problem because it's very rare that you actually hit the contended case, so lockdep always just sees the down_trylock(), not the down_interruptible(), and so it can't tell that there's a problem.
--- drivers/firmware/efi/efi-pstore.c | 2 +- fs/pstore/platform.c | 38 ++++++++++++++++++-------------------- include/linux/pstore.h | 6 +++--- 3 files changed, 22 insertions(+), 24 deletions(-)
drivers/firmware/efi/efi-pstore.c +1 -1
@@ -266,7 +266,7 @@ static int efi_pstore_write(struct pstor efi_name[i] = name[i]; ret =efivar_entry_set_safe (efi_name, vendor,PSTORE_EFI_ATTRIBUTES , -preemptible (), record->size, record->psi->buf); + false, record->size, record->psi->buf);if (record->reason ==KMSG_DUMP_OOPS &&try_module_get (THIS_MODULE ))if (!schedule_work (&efivar_work))
fs/pstore/platform.c +18 -20
@@ -143,21 +143,22 @@ static void pstore_timer_kick(void)mod_timer (&pstore_timer, jiffies +msecs_to_jiffies (pstore_update_ms)); } -/* -* Should pstore_dump() wait for a concurrent pstore_dump()? If -* not, the current pstore_dump() will report a failure to dump -* and return. -*/ -static bool pstore_cannot_wait (enum kmsg_dump_reason reason) +static bool pstore_cannot_block_path (enum kmsg_dump_reason reason) { -/* In NMI path, pstore shouldn't block regardless of reason. */ +/* +* In case of NMI path, pstore shouldn't be blocked +* regardless of reason. +*/ if (in_nmi ())return true;switch (reason) {/* In panic case, other cpus are stopped by smp_send_stop(). */ case KMSG_DUMP_PANIC : -/* Emergency restart shouldn't be blocked. */ +/* +* Emergency restart shouldn't be blocked by spinning on +* pstore_info::buf_lock. +*/ case KMSG_DUMP_EMERG :return true;default :
@@ -389,21 +390,19 @@ static void pstore_dump(struct kmsg_dumpunsigned long total =0 ;const char *why;unsigned int part =1 ; +unsigned long flags =0 ;int ret; why =kmsg_dump_reason_str (reason); -if (down_trylock (&psinfo->buf_lock)) { -/* Failed to acquire lock: give up if we cannot wait. */ -if (pstore_cannot_wait (reason)) { -pr_err ("dump skipped in %s path: may corrupt error record\n" , -in_nmi () ?"NMI" : why); -return ; - } -if (down_interruptible (&psinfo->buf_lock)) { -pr_err ("could not grab semaphore?!\n" ); +if (pstore_cannot_block_path (reason)) { +if (!spin_trylock_irqsave (&psinfo->buf_lock, flags)) { +pr_err ("dump skipped in %s path because of concurrent dump\n" , +in_nmi () ?"NMI" : why);return ; } + }else { +spin_lock_irqsave (&psinfo->buf_lock, flags); }kmsg_dump_rewind (&iter);
@@ -467,8 +466,7 @@ static void pstore_dump(struct kmsg_dump total += record.size; part++; } - -up (&psinfo->buf_lock); +spin_unlock_irqrestore (&psinfo->buf_lock, flags); }static struct kmsg_dumper pstore_dumper = {
@@ -594,7 +592,7 @@ int pstore_register(struct pstore_info * psi->write_user = pstore_write_user_compat; psinfo = psi;mutex_init (&psinfo->read_mutex); -sema_init (&psinfo->buf_lock,1 ); +spin_lock_init (&psinfo->buf_lock);if (psi->flags &PSTORE_FLAGS_DMESG )allocate_buf_for_compression ();
include/linux/pstore.h +3 -3
@@ -14,7 +14,7 @@#include <linux/errno.h> #include <linux/kmsg_dump.h> #include <linux/mutex.h> -#include <linux/semaphore.h> +#include <linux/spinlock.h> #include <linux/time.h> #include <linux/types.h>
@@ -87,7 +87,7 @@ struct pstore_record {* @owner: module which is responsible for this backend driver * @name: name of the backend driver * -* @buf_lock: semaphore to serialize access to @buf +* @buf_lock: spinlock to serialize access to @buf * @buf: preallocated crash dump buffer * @bufsize: size of @buf available for crash dump bytes (must match * smallest number of bytes available for writing to a
@@ -178,7 +178,7 @@ struct pstore_info {struct module *owner;const char *name; -struct semaphore buf_lock; +spinlock_t buf_lock;char *buf;size_t bufsize;
Greg Kroah-Hartman
maintainerPATCH 127/1126 arm64: dts: ti: k3-j721s2: Fix gic-v3 compatible regs
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
commit a966803781fc5e1875511db9392b0d16174c5dd2 upstream.
Though GIC ARE option is disabled for no GIC-v2 compatibility, Cortex-A72 is free to implement the CPU interface as long as it communicates with the GIC using the stream protocol. This requires that the SoC integration mark out the PERIPHBASE[1] as reserved area within the SoC. See longer discussion in [2] for further information.
Update the GIC register map to indicate offsets from PERIPHBASE based on [3]. Without doing this, systems like kvm will not function with gic-v2 emulation.
[1] https://developer.arm.com/documentation/100095/0002/system-control/aarch64-register-descriptions/configuration-base-address-register--el1
[2] https://lore.kernel.org/all/[email protected]/
[3] https://developer.arm.com/documentation/100095/0002/way1382452674438
--- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 5 ++++- arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +4 -1
@@ -34,7 +34,10 @@ #interrupt-cells = <3>; interrupt-controller; reg = <0x00 0x01800000 0x00 0x200000>, /* GICD */ - <0x00 0x01900000 0x00 0x100000>; /* GICR */ + <0x00 0x01900000 0x00 0x100000>, /* GICR */ + <0x00 0x6f000000 0x00 0x2000>, /* GICC */ + <0x00 0x6f010000 0x00 0x1000>, /* GICH */ + <0x00 0x6f020000 0x00 0x2000>; /* GICV */ /* vcpumntirq: virtual CPU interface maintenance interrupt */ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
arch/arm64/boot/dts/ti/k3-j721s2.dtsi +1 -0
@@ -119,6 +119,7 @@ <0x00 0x18000000 0x00 0x18000000 0x00 0x08000000>, /* PCIe1 DAT0 */ <0x00 0x64800000 0x00 0x64800000 0x00 0x0070c000>, /* C71_1 */ <0x00 0x65800000 0x00 0x65800000 0x00 0x0070c000>, /* C71_2 */ + <0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A72 PERIPHBASE */ <0x00 0x70000000 0x00 0x70000000 0x00 0x00400000>, /* MSMC RAM */ <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>, /* MAIN NAVSS */ <0x41 0x00000000 0x41 0x00000000 0x01 0x00000000>, /* PCIe1 DAT1 */
Greg Kroah-Hartman
maintainerPATCH 89/1126 riscv: Increase stack size under KASAN
In reply to Greg Kroah-HartmanFrom: Dmitry Vyukov <[email protected]>
commit b81d591386c3a50b96dddcf663628ea0df0bf2b3 upstream.
KASAN requires more stack space because of compiler instrumentation. Increase stack size as other arches do.
--- arch/riscv/include/asm/thread_info.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/riscv/include/asm/thread_info.h +8 -2
@@ -11,11 +11,17 @@#include <asm/page.h> #include <linux/const.h> +#ifdef CONFIG_KASAN +#define KASAN_STACK_ORDER 1 +#else +#define KASAN_STACK_ORDER 0 +#endif +/* thread information allocation */ #ifdef CONFIG_64BIT -#define THREAD_SIZE_ORDER (2) +#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER)#else -#define THREAD_SIZE_ORDER (1) +#define THREAD_SIZE_ORDER (1 + KASAN_STACK_ORDER)#endif #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
Greg Kroah-Hartman
maintainerPATCH 130/1126 Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag"
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 2ca8e6285250c07a2e5a22ecbfd59b5a4ef73484 upstream.
Revert commit 159d8c274fd9 ("ACPI: Pass the same capabilities to the _OSC regardless of the query flag") which caused legitimate usage scenarios (when the platform firmware does not want the OS to control certain platform features controlled by the system bus scope _OSC) to break and was misguided by some misleading language in the _OSC definition in the ACPI specification (in particular, Section 6.2.11.1.3 "Sequence of _OSC Calls" that contradicts other perts of the _OSC definition).
--- drivers/acpi/bus.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/acpi/bus.c +19 -8
@@ -332,21 +332,32 @@ static void acpi_bus_osc_negotiate_platfif (ACPI_FAILURE (acpi_run_osc (handle, &context)))return ; -kfree (context.ret.pointer); + capbuf_ret = context.ret.pointer; +if (context.ret.length <=OSC_SUPPORT_DWORD ) { +kfree (context.ret.pointer); +return ; + } -/* Now run _OSC again with query flag clear */ +/* +* Now run _OSC again with query flag clear and with the caps +* supported by both the OS and the platform. +*/ capbuf[OSC_QUERY_DWORD ] =0 ; + capbuf[OSC_SUPPORT_DWORD ] = capbuf_ret[OSC_SUPPORT_DWORD ]; +kfree (context.ret.pointer);if (ACPI_FAILURE (acpi_run_osc (handle, &context)))return ; capbuf_ret = context.ret.pointer; - osc_sb_apei_support_acked = - capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_APEI_SUPPORT ; - osc_pc_lpi_support_confirmed = - capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_PCLPI_SUPPORT ; - osc_sb_native_usb4_support_confirmed = - capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_NATIVE_USB4_SUPPORT ; +if (context.ret.length >OSC_SUPPORT_DWORD ) { + osc_sb_apei_support_acked = + capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_APEI_SUPPORT ; + osc_pc_lpi_support_confirmed = + capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_PCLPI_SUPPORT ; + osc_sb_native_usb4_support_confirmed = + capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_NATIVE_USB4_SUPPORT ; + }kfree (context.ret.pointer); }
Greg Kroah-Hartman
maintainerPATCH 166/1126 DEC: Limit PMAX memory probing to R3k systems
In reply to Greg Kroah-HartmanFrom: Maciej W. Rozycki <[email protected]>
commit 244eae91a94c6dab82b3232967d10eeb9dfa21c6 upstream.
Recent tightening of the opcode table in binutils so as to consistently disallow the assembly or disassembly of CP0 instructions not supported by the processor architecture chosen has caused a regression like below:
arch/mips/dec/prom/locore.S: Assembler messages:arch/mips/dec/prom/locore.S:29: Error: opcode not supported on this processor: r4600 (mips3) `rfe'
in a piece of code used to probe for memory with PMAX DECstation models, which have non-REX firmware. Those computers always have an R2000 CPU and consequently the exception handler used in memory probing uses the RFE instruction, which those processors use.
While adding 64-bit support this code was correctly excluded for 64-bit configurations, however it should have also been excluded for irrelevant 32-bit configurations. Do this now then, and only enable PMAX memory probing for R3k systems.
--- arch/mips/dec/prom/Makefile | 2 +- arch/mips/include/asm/dec/prom.h | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-)
arch/mips/dec/prom/Makefile +1 -1
@@ -6,4 +6,4 @@ lib-y += init.o memory.o cmdline.o identify.o console.o -lib-$(CONFIG_32BIT) += locore.o +lib-$(CONFIG_CPU_R3000) += locore.o
arch/mips/include/asm/dec/prom.h +5 -10
@@ -43,16 +43,11 @@*/ #define REX_PROM_MAGIC 0x30464354 -#ifdef CONFIG_64BIT - -#define prom_is_rex (magic) 1/* KN04 and KN05 are REX PROMs. */ - -#else /* !CONFIG_64BIT */ - -#define prom_is_rex (magic) ((magic) == REX_PROM_MAGIC) - -#endif /* !CONFIG_64BIT */ - +/* KN04 and KN05 are REX PROMs, so only do the check for R3k systems. */ +static inline bool prom_is_rex (u32 magic) +{ +return !IS_ENABLED (CONFIG_CPU_R3000 ) || magic ==REX_PROM_MAGIC ; +}/* * 3MIN/MAXINE PROM entry points for DS5000/1xx's, DS5000/xx's and
Greg Kroah-Hartman
maintainerPATCH 165/1126 PM: domains: Fix sleep-in-atomic bug caused by genpd_debug_remove()
In reply to Greg Kroah-HartmanFrom: Shawn Guo <[email protected]>
commit f6bfe8b5b2c2a5ac8bd2fc7bca3706e6c3fc26d8 upstream.
When a genpd with GENPD_FLAG_IRQ_SAFE gets removed, the following sleep-in-atomic bug will be seen, as genpd_debug_remove() will be called with a spinlock being held.
[ 0.029183] BUG: sleeping function called from invalid context at kernel/locking/rwsem.c:1460 [ 0.029204] in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 1, name: swapper/0 [ 0.029219] preempt_count: 1, expected: 0 [ 0.029230] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.17.0-rc4+ #489 [ 0.029245] Hardware name: Thundercomm TurboX CM2290 (DT) [ 0.029256] Call trace: [ 0.029265] dump_backtrace.part.0+0xbc/0xd0 [ 0.029285] show_stack+0x3c/0xa0 [ 0.029298] dump_stack_lvl+0x7c/0xa0 [ 0.029311] dump_stack+0x18/0x34 [ 0.029323] __might_resched+0x10c/0x13c [ 0.029338] __might_sleep+0x4c/0x80 [ 0.029351] down_read+0x24/0xd0 [ 0.029363] lookup_one_len_unlocked+0x9c/0xcc [ 0.029379] lookup_positive_unlocked+0x10/0x50 [ 0.029392] debugfs_lookup+0x68/0xac [ 0.029406] genpd_remove.part.0+0x12c/0x1b4 [ 0.029419] of_genpd_remove_last+0xa8/0xd4 [ 0.029434] psci_cpuidle_domain_probe+0x174/0x53c [ 0.029449] platform_probe+0x68/0xe0 [ 0.029462] really_probe+0x190/0x430 [ 0.029473] __driver_probe_device+0x90/0x18c [ 0.029485] driver_probe_device+0x40/0xe0 [ 0.029497] __driver_attach+0xf4/0x1d0 [ 0.029508] bus_for_each_dev+0x70/0xd0 [ 0.029523] driver_attach+0x24/0x30 [ 0.029534] bus_add_driver+0x164/0x22c [ 0.029545] driver_register+0x78/0x130 [ 0.029556] __platform_driver_register+0x28/0x34 [ 0.029569] psci_idle_init_domains+0x1c/0x28 [ 0.029583] do_one_initcall+0x50/0x1b0 [ 0.029595] kernel_init_freeable+0x214/0x280 [ 0.029609] kernel_init+0x2c/0x13c [ 0.029622] ret_from_fork+0x10/0x20
It doesn't seem necessary to call genpd_debug_remove() with the lock, so move it out from locking to fix the problem.
--- drivers/base/power/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/power/domain.c +1 -1
@@ -2058,9 +2058,9 @@ static int genpd_remove(struct generic_pkfree (link); } -genpd_debug_remove (genpd);list_del (&genpd->gpd_list_node);genpd_unlock (genpd); +genpd_debug_remove (genpd);cancel_work_sync (&genpd->power_off_work);if (genpd_is_cpu_domain (genpd))free_cpumask_var (genpd->cpus);