5.4.257-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 144/367 nfs/blocklayout: Use the passed in gfp flags
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 08b45fcb2d4675f6182fe0edc0d8b1fe604051fa ]
This allocation should use the passed in GFP_ flags instead of GFP_KERNEL. One places where this matters is in filelayout_pg_init_write() which uses GFP_NOFS as the allocation flags.
--- fs/nfs/blocklayout/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/blocklayout/dev.c +2 -2
@@ -422,7 +422,7 @@ bl_parse_concat(struct nfs_server *server, struct pnfs_block_dev *d,int ret, i; d->children =kcalloc (v->concat.volumes_count, -sizeof (struct pnfs_block_dev ),GFP_KERNEL ); +sizeof (struct pnfs_block_dev ), gfp_mask);if (!d->children)return -ENOMEM ;
@@ -451,7 +451,7 @@ bl_parse_stripe(struct nfs_server *server, struct pnfs_block_dev *d,int ret, i; d->children =kcalloc (v->stripe.volumes_count, -sizeof (struct pnfs_block_dev ),GFP_KERNEL ); +sizeof (struct pnfs_block_dev ), gfp_mask);if (!d->children)return -ENOMEM ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 145/367 powerpc/iommu: Fix notifiers being shared by PCI and VIO buses
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell Currey <[email protected]>
[ Upstream commit c37b6908f7b2bd24dcaaf14a180e28c9132b9c58 ]
fail_iommu_setup() registers the fail_iommu_bus_notifier struct to both PCI and VIO buses. struct notifier_block is a linked list node, so this causes any notifiers later registered to either bus type to also be registered to the other since they share the same node.
This causes issues in (at least) the vgaarb code, which registers a notifier for PCI buses. pci_notify() ends up being called on a vio device, converted with to_pci_dev() even though it's not a PCI device, and finally makes a bad access in vga_arbiter_add_pci_device() as discovered with KASAN:
BUG: KASAN: slab-out-of-bounds in vga_arbiter_add_pci_device+0x60/0xe00 Read of size 4 at addr c000000264c26fdc by task swapper/0/1 Call Trace: dump_stack_lvl+0x1bc/0x2b8 (unreliable) print_report+0x3f4/0xc60 kasan_report+0x244/0x698 __asan_load4+0xe8/0x250 vga_arbiter_add_pci_device+0x60/0xe00 pci_notify+0x88/0x444 notifier_call_chain+0x104/0x320 blocking_notifier_call_chain+0xa0/0x140 device_add+0xac8/0x1d30 device_register+0x58/0x80 vio_register_device_node+0x9ac/0xce0 vio_bus_scan_register_devices+0xc4/0x13c __machine_initcall_pseries_vio_device_init+0x94/0xf0 do_one_initcall+0x12c/0xaa8 kernel_init_freeable+0xa48/0xba8 kernel_init+0x64/0x400 ret_from_kernel_thread+0x5c/0x64
Fix this by creating separate notifier_block structs for each bus type.
--- arch/powerpc/kernel/iommu.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/powerpc/kernel/iommu.c +14 -3
@@ -133,17 +133,28 @@ static int fail_iommu_bus_notify(struct notifier_block *nb,return 0 ; } -static struct notifier_block fail_iommu_bus_notifier = { +/* +* PCI and VIO buses need separate notifier_block structs, since they're linked +* list nodes. Sharing a notifier_block would mean that any notifiers later +* registered for PCI buses would also get called by VIO buses and vice versa. +*/ +static struct notifier_block fail_iommu_pci_bus_notifier = { .notifier_call = fail_iommu_bus_notify }; +#ifdef CONFIG_IBMVIO +static struct notifier_block fail_iommu_vio_bus_notifier = { + .notifier_call = fail_iommu_bus_notify +}; +#endif +static int __init fail_iommu_setup (void ) {#ifdef CONFIG_PCI -bus_register_notifier (&pci_bus_type, &fail_iommu_bus_notifier); +bus_register_notifier (&pci_bus_type, &fail_iommu_pci_bus_notifier);#endif #ifdef CONFIG_IBMVIO -bus_register_notifier (&vio_bus_type, &fail_iommu_bus_notifier); +bus_register_notifier (&vio_bus_type, &fail_iommu_vio_bus_notifier);#endif return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 146/367 jfs: validate max amount of blocks before allocation.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Filippov <[email protected]>
[ Upstream commit 0225e10972fa809728b8d4c1bd2772b3ec3fdb57 ]
The lack of checking bmp->db_max_freebud in extBalloc() can lead to shift out of bounds, so this patch prevents undefined behavior, because bmp->db_max_freebud == -1 only if there is no free space.
--- fs/jfs/jfs_extent.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/jfs/jfs_extent.c +5 -0
@@ -508,6 +508,11 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)* blocks in the map. in that case, we'll start off with the * maximum free. */ + +/* give up if no space left */ +if (bmp->db_maxfreebud ==-1 ) +return -ENOSPC ; + max = (s64 )1 << bmp->db_maxfreebud;if (*nblocks >= max && *nblocks > nbperpage) nb = nblks = (max > nbperpage) ? max : nbperpage;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 147/367 fs: lockd: avoid possible wrong NULL parameter
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit de8d38cf44bac43e83bad28357ba84784c412752 ]
clang's static analysis warning: fs/lockd/mon.c: line 293, column 2:
Null pointer passed as 2nd argument to memory copy function.
Assuming 'hostname' is NULL and calling 'nsm_create_handle()', this will pass NULL as 2nd argument to memory copy function 'memcpy()'. So return NULL if 'hostname' is invalid.
--- fs/lockd/mon.c | 3 +++ 1 file changed, 3 insertions(+)
fs/lockd/mon.c +3 -0
@@ -276,6 +276,9 @@ static struct nsm_handle *nsm_create_handle(const struct sockaddr *sap, {struct nsm_handle *new; +if (!hostname) +return NULL ; + new =kzalloc (sizeof (*new) + hostname_len +1 ,GFP_KERNEL );if (unlikely (new ==NULL ))return NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 148/367 NFSD: da_addr_body field missing in some GETDEVICEINFO replies
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 6372e2ee629894433fe6107d7048536a3280a284 ]
The XDR specification in RFC 8881 looks like this:
struct device_addr4 {
layouttype4 da_layout_type;
opaque da_addr_body<>;
};struct GETDEVICEINFO4resok {
device_addr4 gdir_device_addr;
bitmap4 gdir_notification;
};union GETDEVICEINFO4res switch (nfsstat4 gdir_status) { case NFS4_OK:
GETDEVICEINFO4resok gdir_resok4; case NFS4ERR_TOOSMALL: count4 gdir_mincount; default: void; };
Looking at nfsd4_encode_getdeviceinfo() ....
When the client provides a zero gd_maxcount, then the Linux NFS server implementation encodes the da_layout_type field and then skips the da_addr_body field completely, proceeding directly to encode gdir_notification field.
There does not appear to be an option in the specification to skip encoding da_addr_body. Moreover, Section 18.40.3 says:
Quoted 4 lines
If the client wants to just update or turn off notifications, it MAY send a GETDEVICEINFO operation with
gdia_maxcountset to zero. In that event, if the device ID is valid, the reply'sda_addr_bodyfield of thegdir_device_addrfield will be of zero length.
Since the layout drivers are responsible for encoding the da_addr_body field, put this fix inside the ->encode_getdeviceinfo methods.
--- fs/nfsd/blocklayoutxdr.c | 9 +++++++++ fs/nfsd/flexfilelayoutxdr.c | 9 +++++++++ fs/nfsd/nfs4xdr.c | 25 +++++++++++-------------- 3 files changed, 29 insertions(+), 14 deletions(-)
fs/nfsd/blocklayoutxdr.c +9 -0
@@ -82,6 +82,15 @@ nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,int len =sizeof (__be32), ret, i;__be32 *p; +/* +* See paragraph 5 of RFC 8881 S18.40.3. +*/ +if (!gdp->gd_maxcount) { +if (xdr_stream_encode_u32 (xdr,0 ) !=XDR_UNIT ) +return nfserr_resource; +return nfs_ok; + } + p =xdr_reserve_space (xdr, len +sizeof (__be32));if (!p)return nfserr_resource;
fs/nfsd/flexfilelayoutxdr.c +9 -0
@@ -85,6 +85,15 @@ nfsd4_ff_encode_getdeviceinfo(struct xdr_stream *xdr,int addr_len;__be32 *p; +/* +* See paragraph 5 of RFC 8881 S18.40.3. +*/ +if (!gdp->gd_maxcount) { +if (xdr_stream_encode_u32 (xdr,0 ) !=XDR_UNIT ) +return nfserr_resource; +return nfs_ok; + } +/* len + padding for two strings */ addr_len =16 + da->netaddr.netid_len + da->netaddr.addr_len; ver_len =20 ;
fs/nfsd/nfs4xdr.c +11 -14
@@ -4126,20 +4126,17 @@ nfsd4_encode_getdeviceinfo(struct nfsd4_compoundres *resp, __be32 nfserr, *p++ =cpu_to_be32 (gdev->gd_layout_type); -/* If maxcount is 0 then just update notifications */ -if (gdev->gd_maxcount !=0 ) { - ops = nfsd4_layout_ops[gdev->gd_layout_type]; - nfserr = ops->encode_getdeviceinfo (xdr, gdev); -if (nfserr) { -/* -* We don't bother to burden the layout drivers with -* enforcing gd_maxcount, just tell the client to -* come back with a bigger buffer if it's not enough. -*/ -if (xdr->buf->len +4 > gdev->gd_maxcount) - goto toosmall; -return nfserr; - } + ops = nfsd4_layout_ops[gdev->gd_layout_type]; + nfserr = ops->encode_getdeviceinfo (xdr, gdev); +if (nfserr) { +/* +* We don't bother to burden the layout drivers with +* enforcing gd_maxcount, just tell the client to +* come back with a bigger buffer if it's not enough. +*/ +if (xdr->buf->len +4 > gdev->gd_maxcount) + goto toosmall; +return nfserr; }if (gdev->gd_notify_types) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 149/367 NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit f67b55b6588bcf9316a1e6e8d529100a5aa3ebe6 ]
Commit 64cfca85bacd asserts the only valid return values for nfs2/3_decode_dirent should not include -ENAMETOOLONG, but for a server that sends a filename3 which exceeds MAXNAMELEN in a READDIR response the client's behavior will be to endlessly retry the operation.
We could map -ENAMETOOLONG into -EBADCOOKIE, but that would produce truncated listings without any error. The client should return an error for this case to clearly assert that the server implementation must be corrected.
--- fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs3xdr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs2xdr.c +1 -1
@@ -953,7 +953,7 @@ int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_filename_inline (xdr, &entry->name, &entry->len);if (unlikely (error)) -return -EAGAIN ; +return error == -ENAMETOOLONG ? -ENAMETOOLONG : -EAGAIN ;/* * The type (size and byte order) of nfscookie isn't defined in
fs/nfs/nfs3xdr.c +1 -1
@@ -1991,7 +1991,7 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_inline_filename3 (xdr, &entry->name, &entry->len);if (unlikely (error)) -return -EAGAIN ; +return error == -ENAMETOOLONG ? -ENAMETOOLONG : -EAGAIN ; error =decode_cookie3 (xdr, &new_cookie);if (unlikely (error))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 150/367 media: v4l2-fwnode: fix v4l2_fwnode_parse_link handling
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Felsch <[email protected]>
[ Upstream commit 453b0c8304dcbc6eed2836de8fee90bf5bcc7006 ]
Currently the driver differentiate the port number property handling for ACPI and DT. This is wrong as because ACPI should use the "reg" val too [1].
[1] https://patchwork.kernel.org/patch/11421985/
Stable-dep-of: d7b13edd4cb4 ("media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()")
--- drivers/media/v4l2-core/v4l2-fwnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-fwnode.c +1 -1
@@ -563,7 +563,7 @@ EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_alloc_parse);int v4l2_fwnode_parse_link (struct fwnode_handle *__fwnode,struct v4l2_fwnode_link *link) { -const char *port_prop =is_of_node (__fwnode) ?"reg" :"port" ; +const char *port_prop ="reg" ;struct fwnode_handle *fwnode;memset (link,0 ,sizeof (*link));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 151/367 media: v4l2-fwnode: simplify v4l2_fwnode_parse_link
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Felsch <[email protected]>
[ Upstream commit 507a0ba93aa1cf2837d2abc4ab0cbad3c29409d3 ]
This helper was introduced before those helpers where awailable. Convert it to cleanup the code and improbe readability.
Stable-dep-of: d7b13edd4cb4 ("media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()")
--- drivers/media/v4l2-core/v4l2-fwnode.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/media/v4l2-core/v4l2-fwnode.c +9 -16
@@ -560,33 +560,26 @@ int v4l2_fwnode_endpoint_alloc_parse(struct fwnode_handle *fwnode, }EXPORT_SYMBOL_GPL (v4l2_fwnode_endpoint_alloc_parse); -int v4l2_fwnode_parse_link (struct fwnode_handle *__fwnode, +int v4l2_fwnode_parse_link (struct fwnode_handle *fwnode,struct v4l2_fwnode_link *link) { -const char *port_prop ="reg" ; -struct fwnode_handle *fwnode; +struct fwnode_endpoint fwep;memset (link,0 ,sizeof (*link)); - fwnode =fwnode_get_parent (__fwnode); -fwnode_property_read_u32 (fwnode, port_prop, &link->local_port); - fwnode =fwnode_get_next_parent (fwnode); -if (is_of_node (fwnode) &&of_node_name_eq (to_of_node (fwnode),"ports" )) - fwnode =fwnode_get_next_parent (fwnode); - link->local_node = fwnode; +fwnode_graph_parse_endpoint (fwnode, &fwep); + link->local_port = fwep.port; + link->local_node =fwnode_graph_get_port_parent (fwnode); - fwnode =fwnode_graph_get_remote_endpoint (__fwnode); + fwnode =fwnode_graph_get_remote_endpoint (fwnode);if (!fwnode) {fwnode_handle_put (fwnode);return -ENOLINK ; } - fwnode =fwnode_get_parent (fwnode); -fwnode_property_read_u32 (fwnode, port_prop, &link->remote_port); - fwnode =fwnode_get_next_parent (fwnode); -if (is_of_node (fwnode) &&of_node_name_eq (to_of_node (fwnode),"ports" )) - fwnode =fwnode_get_next_parent (fwnode); - link->remote_node = fwnode; +fwnode_graph_parse_endpoint (fwnode, &fwep); + link->remote_port = fwep.port; + link->remote_node =fwnode_graph_get_port_parent (fwnode);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 152/367 media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit d7b13edd4cb4bfa335b6008ab867ac28582d3e5c ]
If fwnode_graph_get_remote_endpoint() fails, 'fwnode' is known to be NULL, so fwnode_handle_put() is a no-op.
Release the reference taken from a previous fwnode_graph_get_port_parent() call instead.
Also handle fwnode_graph_get_port_parent() failures.
In order to fix these issues, add an error handling path to the function and the needed gotos.
--- drivers/media/v4l2-core/v4l2-fwnode.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/media/v4l2-core/v4l2-fwnode.c +14 -4
@@ -570,18 +570,28 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,fwnode_graph_parse_endpoint (fwnode, &fwep); link->local_port = fwep.port; link->local_node =fwnode_graph_get_port_parent (fwnode); +if (!link->local_node) +return -ENOLINK ; fwnode =fwnode_graph_get_remote_endpoint (fwnode); -if (!fwnode) { -fwnode_handle_put (fwnode); -return -ENOLINK ; - } +if (!fwnode) + goto err_put_local_node;fwnode_graph_parse_endpoint (fwnode, &fwep); link->remote_port = fwep.port; link->remote_node =fwnode_graph_get_port_parent (fwnode); +if (!link->remote_node) + goto err_put_remote_endpoint;return 0 ; + +err_put_remote_endpoint: +fwnode_handle_put (fwnode); + +err_put_local_node: +fwnode_handle_put (link->local_node); + +return -ENOLINK ; }EXPORT_SYMBOL_GPL (v4l2_fwnode_parse_link);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 153/367 drivers: usb: smsusb: fix error handling code in smsusb_init_device
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongliang Mu <[email protected]>
[ Upstream commit b9c7141f384097fa4fa67d2f72e5731d628aef7c ]
The previous commit 4b208f8b561f ("[media] siano: register media controller earlier")moves siano_media_device_register before smscore_register_device, and adds corresponding error handling code if smscore_register_device fails. However, it misses the following error handling code of smsusb_init_device.
Fix this by moving error handling code at the end of smsusb_init_device and adding a goto statement in the following error handling parts.
--- drivers/media/usb/siano/smsusb.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/media/usb/siano/smsusb.c +11 -10
@@ -455,12 +455,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smscore_register_device (¶ms, &dev->coredev,0 , mdev);if (rc <0 ) {pr_err ("smscore_register_device(...) failed, rc %d\n" , rc); -smsusb_term_device (intf); -#ifdef CONFIG_MEDIA_CONTROLLER_DVB -media_device_unregister (mdev); -#endif -kfree (mdev); -return rc; + goto err_unregister_device; }smscore_set_board_id (dev->coredev, board_id);
@@ -477,8 +472,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smsusb_start_streaming (dev);if (rc <0 ) {pr_err ("smsusb_start_streaming(...) failed\n" ); -smsusb_term_device (intf); -return rc; + goto err_unregister_device; } dev->state =SMSUSB_ACTIVE ;
@@ -486,13 +480,20 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smscore_start_device (dev->coredev);if (rc <0 ) {pr_err ("smscore_start_device(...) failed\n" ); -smsusb_term_device (intf); -return rc; + goto err_unregister_device; }pr_debug ("device 0x%p created\n" , dev);return rc; + +err_unregister_device: +smsusb_term_device (intf); +#ifdef CONFIG_MEDIA_CONTROLLER_DVB +media_device_unregister (mdev); +#endif +kfree (mdev); +return rc; } static int smsusb_probe(struct usb_interface *intf,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 154/367 media: dib7000p: Fix potential division by zero
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
[ Upstream commit a1db7b2c5533fc67e2681eb5efc921a67bc7d5b8 ]
Variable loopdiv can be assigned 0, then it is used as a denominator, without checking it for 0.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/dvb-frontends/dib7000p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb-frontends/dib7000p.c +1 -1
@@ -497,7 +497,7 @@ static int dib7000p_update_pll(struct dvb_frontend *fe, struct dibx000_bandwidth prediv = reg_1856 &0x3f ; loopdiv = (reg_1856 >>6 ) &0x3f ; -if ((bw !=NULL ) && (bw->pll_prediv != prediv || bw->pll_ratio != loopdiv)) { +if (loopdiv && bw && (bw->pll_prediv != prediv || bw->pll_ratio != loopdiv)) {dprintk ("Updating pll (prediv: old = %d new = %d ; loopdiv : old = %d new = %d)\n" , prediv, bw->pll_prediv, loopdiv, bw->pll_ratio); reg_1856 &=0xf000 ; reg_1857 =dib7000p_read_word (state,1857 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 155/367 media: dvb-usb: m920x: Fix a potential memory leak in m920x_i2c_xfer()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit ea9ef6c2e001c5dc94bee35ebd1c8a98621cf7b8 ]
'read' is freed when it is known to be NULL, but not when a read error occurs.
Revert the logic to avoid a small leak, should a m920x_read() call fail.
--- drivers/media/usb/dvb-usb/m920x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/usb/dvb-usb/m920x.c +3 -2
@@ -277,7 +277,6 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nuchar *read =kmalloc (1 ,GFP_KERNEL );if (!read) { ret = -ENOMEM ; -kfree (read); goto unlock; }
@@ -288,8 +287,10 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nuif ((ret =m920x_read (d->udev,M9206_I2C ,0x0 ,0x20 | stop, - read,1 )) !=0 ) + read,1 )) !=0 ) { +kfree (read); goto unlock; + } msg[i].buf[j] = read[0 ]; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 156/367 media: cx24120: Add retval check for cx24120_message_send()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
[ Upstream commit 96002c0ac824e1773d3f706b1f92e2a9f2988047 ]
If cx24120_message_send() returns error, we should keep local struct unchanged.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/dvb-frontends/cx24120.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/cx24120.c +3 -1
@@ -972,7 +972,9 @@ static void cx24120_set_clock_ratios(struct dvb_frontend *fe) cmd.arg[8 ] = (clock_ratios_table[idx].rate >>8 ) &0xff ; cmd.arg[9 ] = (clock_ratios_table[idx].rate >>0 ) &0xff ; -cx24120_message_send (state, &cmd); + ret =cx24120_message_send (state, &cmd); +if (ret !=0 ) +return ;/* Calculate ber window rates for stat work */ cx24120_calculate_ber_window (state, clock_ratios_table[idx].rate);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 157/367 media: mediatek: vcodec: Return NULL if no vdec_fb is found
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Irui Wang <[email protected]>
[ Upstream commit dfa2d6e07432270330ae191f50a0e70636a4cd2b ]
"fb_use_list" is used to store used or referenced frame buffers for vp9 stateful decoder. "NULL" should be returned when getting target frame buffer failed from "fb_use_list", not a random unexpected one.
--- drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +3 -2
@@ -222,10 +222,11 @@ static struct vdec_fb *vp9_rm_from_fb_use_list(struct vdec_vp9_instif (fb->base_y.va == addr) {list_move_tail (&node->list, &inst->available_fb_node_list); -break ; +return fb; } } -return fb; + +return NULL ; } static void vp9_add_to_fb_free_list(struct vdec_vp9_inst *inst,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 158/367 usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
[ Upstream commit 5eda42aebb7668b4dcff025cd3ccb0d3d7c53da6 ]
The function mxs_phy_is_otg_host() will return true if OTG_ID_VALUE is 0 at USBPHY_CTRL register. However, OTG_ID_VALUE will not reflect the real state if the ID pin is float, such as Host-only or Type-C cases. The value of OTG_ID_VALUE is always 1 which means device mode.
This patch will fix the issue by judging the current mode based on last_event. The controller will update last_event in time.
--- drivers/usb/phy/phy-mxs-usb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +2 -8
@@ -388,14 +388,8 @@ static void __mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool disconnect)static bool mxs_phy_is_otg_host (struct mxs_phy *mxs_phy) { -void __iomem *base = mxs_phy->phy.io_priv; -u32 phyctrl =readl (base +HW_USBPHY_CTRL ); - -if (IS_ENABLED (CONFIG_USB_OTG ) && - !(phyctrl &BM_USBPHY_CTRL_OTG_ID_VALUE )) -return true; - -return false; +return IS_ENABLED (CONFIG_USB_OTG ) && + mxs_phy->phy.last_event ==USB_EVENT_ID ; }static void mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool on)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 159/367 scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit ce51c817008450ef4188471db31639d42d37a5e1 ]
The functions iscsi_if_set_param() and iscsi_if_set_host_param() convert an nlattr payload to type char* and then call C string handling functions like sscanf and kstrdup:
char *data = (char*)ev + sizeof(*ev); ... sscanf(data, "%d", &value);
However, since the nlattr is provided by the user-space program and the nlmsg skb is allocated with GFP_KERNEL instead of GFP_ZERO flag (see netlink_alloc_large_skb() in netlink_sendmsg()), dirty data on the heap can lead to an OOB access for those string handling functions.
By investigating how the bug is introduced, we find it is really interesting as the old version parsing code starting from commit fd7255f51a13 ("[SCSI] iscsi: add sysfs attrs for uspace sync up") treated the nlattr as integer bytes instead of string and had length check in iscsi_copy_param():
if (ev->u.set_param.len != sizeof(uint32_t))
BUG();But, since the commit a54a52caad4b ("[SCSI] iscsi: fixup set/get param functions"), the code treated the nlattr as C string while forgetting to add any strlen checks(), opening the possibility of an OOB access.
Fix the potential OOB by adding the strlen() check before accessing the buf. If the data passes this check, all low-level set_param handlers can safely treat this buf as legal C string.
--- drivers/scsi/scsi_transport_iscsi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/scsi/scsi_transport_iscsi.c +8 -0
@@ -2767,6 +2767,10 @@ iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev)if (!conn || !session)return -EINVAL ; +/* data will be regarded as NULL-ended string, do length check */ +if (strlen (data) > ev->u.set_param.len) +return -EINVAL ; +switch (ev->u.set_param.param) {case ISCSI_PARAM_SESS_RECOVERY_TMO :sscanf (data,"%d" , &value);
@@ -2919,6 +2923,10 @@ iscsi_set_host_param(struct iscsi_transport *transport,return -ENODEV ; } +/* see similar check in iscsi_if_set_param() */ +if (strlen (data) > ev->u.set_host_param.len) +return -EINVAL ; + err = transport->set_host_param (shost, ev->u.set_host_param.param, data, ev->u.set_host_param.len);scsi_host_put (shost);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 160/367 scsi: be2iscsi: Add length check when parsing nlattrs
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit ee0268f230f66cb472df3424f380ea668da2749a ]
beiscsi_iface_set_param() parses nlattr with nla_for_each_attr and assumes every attributes can be viewed as struct iscsi_iface_param_info.
This is not true because there is no any nla_policy to validate the attributes passed from the upper function iscsi_set_iface_params().
Add the nla_len check before accessing the nlattr data and return EINVAL if the length check fails.
--- drivers/scsi/be2iscsi/be_iscsi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/be2iscsi/be_iscsi.c +4 -0
@@ -441,6 +441,10 @@ int beiscsi_iface_set_param(struct Scsi_Host *shost, }nla_for_each_attr (attrib, data, dt_len, rm_len) { +/* ignore nla_type as it is never used */ +if (nla_len (attrib) <sizeof (*iface_param)) +return -EINVAL ; + iface_param =nla_data (attrib);if (iface_param->param_type !=ISCSI_NET_PARAM )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 161/367 scsi: qla4xxx: Add length check when parsing nlattrs
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit 47cd3770e31df942e2bb925a9a855c79ed0662eb ]
There are three places that qla4xxx parses nlattrs:
- qla4xxx_set_chap_entry()
- qla4xxx_iface_set_param()
- qla4xxx_sysfs_ddb_set_param()
and each of them directly converts the nlattr to specific pointer of structure without length checking. This could be dangerous as those attributes are not validated and a malformed nlattr (e.g., length 0) could result in an OOB read that leaks heap dirty data.
Add the nla_len check before accessing the nlattr data and return EINVAL if the length check fails.
--- drivers/scsi/qla4xxx/ql4_os.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/scsi/qla4xxx/ql4_os.c +15 -0
@@ -939,6 +939,11 @@ static int qla4xxx_set_chap_entry(struct Scsi_Host *shost, void *data, int len)memset (&chap_rec,0 ,sizeof (chap_rec));nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*param_info)) { + rc = -EINVAL ; + goto exit_set_chap; + } + param_info =nla_data (attr);switch (param_info->param) {
@@ -2723,6 +2728,11 @@ qla4xxx_iface_set_param(struct Scsi_Host *shost, void *data, uint32_t len) }nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*iface_param)) { + rval = -EINVAL ; + goto exit_init_fw_cb; + } + iface_param =nla_data (attr);if (iface_param->param_type ==ISCSI_NET_PARAM ) {
@@ -8093,6 +8103,11 @@ qla4xxx_sysfs_ddb_set_param(struct iscsi_bus_flash_session *fnode_sess,memset ((void *)&chap_tbl,0 ,sizeof (chap_tbl));nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*fnode_param)) { + rc = -EINVAL ; + goto exit_set_param; + } + fnode_param =nla_data (attr);switch (fnode_param->param) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 162/367 serial: sprd: getting port index via serial aliases only
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit 4b7349cb4e26e79429ecd619eb588bf384f69fdb ]
This patch simplifies the process of getting serial port number, with this patch, serial devices must have aliases configured in devicetree.
The serial port searched out via sprd_port array maybe wrong if we don't have serial alias defined in devicetree, and specify console with command line, we would get the wrong port number if other serial ports probe failed before console's. So using aliases is mandatory.
Stable-dep-of: f9608f188756 ("serial: sprd: Assign sprd_port after initialized to avoid wrong access")
--- drivers/tty/serial/sprd_serial.c | 36 +++++--------------------------- 1 file changed, 5 insertions(+), 31 deletions(-)
drivers/tty/serial/sprd_serial.c +5 -31
@@ -1073,29 +1073,6 @@ static struct uart_driver sprd_uart_driver = { .cons = SPRD_CONSOLE, }; -static int sprd_probe_dt_alias (int index,struct device *dev) -{ -struct device_node *np; -int ret = index; - -if (!IS_ENABLED (CONFIG_OF )) -return ret; - - np = dev->of_node; -if (!np) -return ret; - - ret =of_alias_get_id (np,"serial" ); -if (ret <0 ) - ret = index; -else if (ret >=ARRAY_SIZE (sprd_port) || sprd_port[ret] !=NULL ) { -dev_warn (dev,"requested serial port %d not available.\n" , ret); - ret = index; - } - -return ret; -} -static int sprd_remove (struct platform_device *dev) {struct sprd_uart_port *sup =platform_get_drvdata (dev);
@@ -1173,14 +1150,11 @@ static int sprd_probe(struct platform_device *pdev)int index;int ret; -for (index =0 ; index <ARRAY_SIZE (sprd_port); index++) -if (sprd_port[index] ==NULL ) -break ; - -if (index ==ARRAY_SIZE (sprd_port)) -return -EBUSY ; - - index =sprd_probe_dt_alias (index, &pdev->dev); + index =of_alias_get_id (pdev->dev.of_node,"serial" ); +if (index <0 || index >=ARRAY_SIZE (sprd_port)) { +dev_err (&pdev->dev,"got a wrong serial alias id %d\n" , index); +return -EINVAL ; + } sprd_port[index] =devm_kzalloc (&pdev->dev,sizeof (*sprd_port[index]),GFP_KERNEL );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 163/367 serial: sprd: remove redundant sprd_port cleanup
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit 72534077475fc489f8358c0e214cc1a4d658c8c2 ]
We don't need to cleanup sprd_port anymore, since we've dropped the way of using the sprd_port[] array to get port index.
Stable-dep-of: f9608f188756 ("serial: sprd: Assign sprd_port after initialized to avoid wrong access")
--- drivers/tty/serial/sprd_serial.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/tty/serial/sprd_serial.c +1 -3
@@ -1205,10 +1205,8 @@ static int sprd_probe(struct platform_device *pdev) sprd_ports_num++; ret =uart_add_one_port (&sprd_uart_driver, up); -if (ret) { - sprd_port[index] =NULL ; +if (ret)sprd_remove (pdev); - }platform_set_drvdata (pdev, up);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 164/367 serial: sprd: Assign sprd_port after initialized to avoid wrong access
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit f9608f1887568b728839d006024585ab02ef29e5 ]
The global pointer 'sprd_port' may not zero when sprd_probe returns failure, that is a risk for sprd_port to be accessed afterward, and may lead to unexpected errors.
For example:
There are two UART ports, UART1 is used for console and configured in kernel command line, i.e. "console=";
The UART1 probe failed and the memory allocated to sprd_port[1] was released, but sprd_port[1] was not set to NULL;
In UART2 probe, the same virtual address was allocated to sprd_port[2], and UART2 probe process finally will go into sprd_console_setup() to register UART1 as console since it is configured as preferred console (filled to console_cmdline[]), but the console parameters (sprd_port[1]) belong to UART2.
So move the sprd_port[] assignment to where the port already initialized can avoid the above issue.
--- drivers/tty/serial/sprd_serial.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/tty/serial/sprd_serial.c +17 -8
@@ -1103,7 +1103,7 @@ static bool sprd_uart_is_console(struct uart_port *uport)static int sprd_clk_init (struct uart_port *uport) {struct clk *clk_uart, *clk_parent; -struct sprd_uart_port *u = sprd_port[uport->line]; + struct sprd_uart_port *u = container_of(uport, struct sprd_uart_port, port); clk_uart =devm_clk_get (uport->dev,"uart" );if (IS_ERR (clk_uart)) {
@@ -1146,22 +1146,22 @@ static int sprd_probe(struct platform_device *pdev) {struct resource *res;struct uart_port *up; +struct sprd_uart_port *sport;int irq;int index;int ret; index =of_alias_get_id (pdev->dev.of_node,"serial" ); -if (index <0 || index >=ARRAY_SIZE (sprd_port)) { +if (index <0 || index >=UART_NR_MAX ) {dev_err (&pdev->dev,"got a wrong serial alias id %d\n" , index);return -EINVAL ; } - sprd_port[index] =devm_kzalloc (&pdev->dev,sizeof (*sprd_port[index]), -GFP_KERNEL ); -if (!sprd_port[index]) + sport =devm_kzalloc (&pdev->dev,sizeof (*sport),GFP_KERNEL ); +if (!sport)return -ENOMEM ; - up = &sprd_port[index]->port; + up = &sport->port; up->dev = &pdev->dev; up->line = index; up->type =PORT_SPRD ;
@@ -1191,7 +1191,7 @@ static int sprd_probe(struct platform_device *pdev)* Allocate one dma buffer to prepare for receive transfer, in case * memory allocation failure at runtime. */ - ret =sprd_rx_alloc_buf (sprd_port[index]); + ret =sprd_rx_alloc_buf (sport);if (ret)return ret;
@@ -1202,14 +1202,23 @@ static int sprd_probe(struct platform_device *pdev)return ret; } } + sprd_ports_num++; + sprd_port[index] = sport; ret =uart_add_one_port (&sprd_uart_driver, up);if (ret) -sprd_remove (pdev); + goto clean_port;platform_set_drvdata (pdev, up); +return 0 ; + +clean_port: + sprd_port[index] =NULL ; +if (--sprd_ports_num ==0 ) +uart_unregister_driver (&sprd_uart_driver); +sprd_rx_free_buf (sport);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 165/367 serial: sprd: Fix DMA buffer leak issue
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit cd119fdc3ee1450fbf7f78862b5de44c42b6e47f ]
Release DMA buffer when _probe() returns failure to avoid memory leak.
--- drivers/tty/serial/sprd_serial.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/sprd_serial.c +3 -2
@@ -371,7 +371,7 @@ static void sprd_rx_free_buf(struct sprd_uart_port *sp)if (sp->rx_dma.virt)dma_free_coherent (sp->port.dev,SPRD_UART_RX_SIZE , sp->rx_dma.virt, sp->rx_dma.phys_addr); - + sp->rx_dma.virt =NULL ; }static int sprd_rx_dma_config (struct uart_port *port,u32 burst)
@@ -1199,7 +1199,7 @@ static int sprd_probe(struct platform_device *pdev) ret =uart_register_driver (&sprd_uart_driver);if (ret <0 ) {pr_err ("Failed to register SPRD-UART driver\n" ); -return ret; + goto free_rx_buf; } }
@@ -1218,6 +1218,7 @@ static int sprd_probe(struct platform_device *pdev) sprd_port[index] =NULL ;if (--sprd_ports_num ==0 )uart_unregister_driver (&sprd_uart_driver); +free_rx_buf:sprd_rx_free_buf (sport);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 166/367 x86/APM: drop the duplicate APM_MINOR_DEV macro
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 4ba2909638a29630a346d6c4907a3105409bee7d ]
This source file already includes <linux/miscdevice.h>, which contains the same macro. It doesn't need to be defined here again.
--- arch/x86/kernel/apm_32.c | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/kernel/apm_32.c +0 -6
@@ -237,12 +237,6 @@extern int (*console_blank_hook)(int );#endif -/* -* The apm_bios device is one of the misc char devices. -* This is its minor number. -*/ -#define APM_MINOR_DEV 134 -/* * Various options can be changed at boot time as follows: * (We allow underscores for compatibility with the modules code)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 167/367 scsi: qedf: Do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 7d3d20dee4f648ec44e9717d5f647d594d184433 ]
The qedf_dbg_stop_io_on_error_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by using a small on-stack buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_debugfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/qedf/qedf_debugfs.c +3 -4
@@ -187,18 +187,17 @@ qedf_dbg_stop_io_on_error_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { int cnt; +char cbuf[7 ];struct qedf_dbg_ctx *qedf_dbg = (struct qedf_dbg_ctx *)filp->private_data;struct qedf_ctx *qedf =container_of (qedf_dbg, struct qedf_ctx, dbg_ctx);QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"entered\n" ); - cnt =sprintf (buffer,"%s\n" , + cnt =scnprintf (cbuf,sizeof (cbuf),"%s\n" , qedf->stop_io_on_error ?"true" :"false" ); - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; +return simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 168/367 scsi: qedf: Do not touch __user pointer in qedf_dbg_debug_cmd_read() directly
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 31b5991a9a91ba97237ac9da509d78eec453ff72 ]
The qedf_dbg_debug_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by using a small on-stack buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_debugfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/qedf/qedf_debugfs.c +3 -4
@@ -140,15 +140,14 @@ qedf_dbg_debug_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) {int cnt; +char cbuf[32 ];struct qedf_dbg_ctx *qedf_dbg = (struct qedf_dbg_ctx *)filp->private_data;QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"debug mask=0x%x\n" , qedf_debug); - cnt =sprintf (buffer,"debug mask = 0x%x\n" , qedf_debug); + cnt =scnprintf (cbuf,sizeof (cbuf),"debug mask = 0x%x\n" , qedf_debug); - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; +return simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 169/367 scsi: qedf: Do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 25dbc20deab5165f847b4eb42f376f725a986ee8 ]
The qedf_dbg_fp_int_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by vmalloc()'ating a buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_dbg.h | 2 ++ drivers/scsi/qedf/qedf_debugfs.c | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-)
drivers/scsi/qedf/qedf_dbg.h +2 -0
@@ -60,6 +60,8 @@ extern uint qedf_debug;#define QEDF_LOG_NOTICE 0x40000000/* Notice logs */ #define QEDF_LOG_WARN 0x80000000/* Warning logs */ +#define QEDF_DEBUGFS_LOG_LEN (2 * PAGE_SIZE) +/* Debug context structure */ struct qedf_dbg_ctx {unsigned int host_no;
drivers/scsi/qedf/qedf_debugfs.c +15 -6
@@ -8,6 +8,7 @@#include <linux/uaccess.h> #include <linux/debugfs.h> #include <linux/module.h> +#include <linux/vmalloc.h> #include "qedf.h" #include "qedf_dbg.h"
@@ -100,7 +101,9 @@ static ssize_t qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { + ssize_t ret;size_t cnt =0 ; +char *cbuf;int id;struct qedf_fastpath *fp =NULL ; struct qedf_dbg_ctx *qedf_dbg =
@@ -110,19 +113,25 @@ qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t count,QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"entered\n" ); - cnt =sprintf (buffer,"\nFastpath I/O completions\n\n" ); + cbuf =vmalloc (QEDF_DEBUGFS_LOG_LEN ); +if (!cbuf) +return 0 ; + + cnt +=scnprintf (cbuf + cnt,QEDF_DEBUGFS_LOG_LEN - cnt,"\nFastpath I/O completions\n\n" );for (id =0 ; id < qedf->num_queues; id++) { fp = &(qedf->fp_array[id]);if (fp->sb_id ==QEDF_SB_ID_NULL )continue ; - cnt +=sprintf ((buffer + cnt),"#%d: %lu\n" , id, - fp->completions); + cnt +=scnprintf (cbuf + cnt,QEDF_DEBUGFS_LOG_LEN - cnt, +"#%d: %lu\n" , id, fp->completions); } - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; + ret =simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); + +vfree (cbuf); + +return ret; } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 170/367 coresight: tmc: Explicit type conversions to prevent integer overflow
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ruidong Tian <[email protected]>
[ Upstream commit fd380097cdb305582b7a1f9476391330299d2c59 ]
Perf cs_etm session executed unexpectedly when AUX buffer > 1G.
perf record -C 0 -m ,2G -e cs_etm// -- <workload> [ perf record: Captured and wrote 2.615 MB perf.data ]
Perf only collect about 2M perf data rather than 2G. This is becasuse the operation, "nr_pages << PAGE_SHIFT", in coresight tmc driver, will overflow when nr_pages >= 0x80000(correspond to 1G AUX buffer). The overflow cause buffer allocation to fail, and TMC driver will alloc minimal buffer size(1M). You can just get about 2M perf data(1M AUX buffer + perf data header) at least.
Explicit convert nr_pages to 64 bit to avoid overflow.
--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 5 +++-- drivers/hwtracing/coresight/coresight-tmc.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +1 -1
@@ -426,7 +426,7 @@ static int tmc_set_etf_buffer(struct coresight_device *csdev,return -EINVAL ;/* wrap head around to the amount of space we have */ - head = handle->head & ((buf->nr_pages <<PAGE_SHIFT ) -1 ); + head = handle->head & (((unsigned long )buf->nr_pages <<PAGE_SHIFT ) -1 );/* find the page to write to */ buf->cur = head /PAGE_SIZE ;
drivers/hwtracing/coresight/coresight-tmc-etr.c +3 -2
@@ -47,7 +47,8 @@ struct etr_perf_buffer { };/* Convert the perf index to an offset within the ETR buffer */ -#define PERF_IDX2OFF (idx, buf) ((idx) % ((buf)->nr_pages << PAGE_SHIFT)) +#define PERF_IDX2OFF (idx, buf) \ + ((idx) % ((unsigned long)(buf)->nr_pages << PAGE_SHIFT))/* Lower limit for ETR hardware buffer */ #define TMC_ETR_PERF_MIN_BUF_SIZE SZ_1M
@@ -1215,7 +1216,7 @@ alloc_etr_buf(struct tmc_drvdata *drvdata, struct perf_event *event,* than the size requested via sysfs. */ if ((nr_pages <<PAGE_SHIFT ) > drvdata->size) { - etr_buf =tmc_alloc_etr_buf (drvdata, (nr_pages <<PAGE_SHIFT ), + etr_buf =tmc_alloc_etr_buf (drvdata, ((ssize_t )nr_pages <<PAGE_SHIFT ),0 , node,NULL );if (!IS_ERR (etr_buf)) goto done;
drivers/hwtracing/coresight/coresight-tmc.h +1 -1
@@ -320,7 +320,7 @@ ssize_t tmc_sg_table_get_data(struct tmc_sg_table *sg_table,static inline unsigned long tmc_sg_table_buf_size (struct tmc_sg_table *sg_table) { -return sg_table->data_pages.nr_pages <<PAGE_SHIFT ; +return (unsigned long )sg_table->data_pages.nr_pages <<PAGE_SHIFT ; }struct coresight_device *tmc_etr_get_catu_device (struct tmc_drvdata *drvdata);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 171/367 dma-buf/sync_file: Fix docs syntax
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
[ Upstream commit 05d56d8079d510a2994039470f65bea85f0075ee ]
Fixes the warning:
include/uapi/linux/sync_file.h:77: warning: Function parameter or member 'num_fences' not described in 'sync_file_info'
--- include/uapi/linux/sync_file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/sync_file.h +1 -1
@@ -52,7 +52,7 @@ struct sync_fence_info {* @name: name of fence * @status: status of fence. 1: signaled 0:active <0:error * @flags: sync_file_info flags -* @num_fences number of fences in the sync_file +* @num_fences: number of fences in the sync_file * @pad: padding for 64-bit alignment, should always be zero * @sync_fence_info: pointer to array of structs sync_fence_info with all * fences in the sync_file
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 172/367 driver core: test_async: fix an error code
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 22d2381bbd70a5853c2ee77522f4965139672db9 ]
The test_platform_device_register_node() function should return error pointers instead of NULL. That is what the callers are expecting.
--- drivers/base/test/test_async_driver_probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/test/test_async_driver_probe.c +1 -1
@@ -84,7 +84,7 @@ test_platform_device_register_node(char *name, int id, int nid) pdev =platform_device_alloc (name, id);if (!pdev) -return NULL ; +return ERR_PTR (-ENOMEM );if (nid !=NUMA_NO_NODE )set_dev_node (&pdev->dev, nid);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 173/367 IB/uverbs: Fix an potential error pointer dereference
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Yang <[email protected]>
[ Upstream commit 26b7d1a27167e7adf75b150755e05d2bc123ce55 ]
smatch reports the warning below:drivers/infiniband/core/uverbs_std_types_counters.c:110 ib_uverbs_handler_UVERBS_METHOD_COUNTERS_READ() error: 'uattr' dereferencing possible ERR_PTR()
The return value of uattr maybe ERR_PTR(-ENOENT), fix this by checking the value of uattr before using it.
--- drivers/infiniband/core/uverbs_std_types_counters.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/core/uverbs_std_types_counters.c +2 -0
@@ -105,6 +105,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_READ)(return ret; uattr =uverbs_attr_get (attrs,UVERBS_ATTR_READ_COUNTERS_BUFF ); +if (IS_ERR (uattr)) +return PTR_ERR (uattr); read_attr.ncounters = uattr->ptr_attr.len /sizeof (u64); read_attr.counters_buff =uverbs_zalloc ( attrs,array_size (read_attr.ncounters,sizeof (u64)));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 174/367 iommu/vt-d: Fix to flush cache of PASID directory table
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yanfei Xu <[email protected]>
[ Upstream commit 8a3b8e63f8371c1247b7aa24ff9c5312f1a6948b ]
Even the PCI devices don't support pasid capability, PASID table is mandatory for a PCI device in scalable mode. However flushing cache of pasid directory table for these devices are not taken after pasid table is allocated as the "size" of table is zero. Fix it by calculating the size by page order.
Found this when reading the code, no real problem encountered for now.
--- drivers/iommu/intel-pasid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel-pasid.c +1 -1
@@ -167,7 +167,7 @@ int intel_pasid_alloc_table(struct device *dev)device_attach_pasid_table (info, pasid_table);if (!ecap_coherent (info->iommu->ecap)) -clflush_cache_range (pasid_table->table, size); +clflush_cache_range (pasid_table->table, (1 << order) *PAGE_SIZE );return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 175/367 media: go7007: Remove redundant if statement
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
[ Upstream commit f33cb49081da0ec5af0888f8ecbd566bd326eed1 ]
The if statement that compares msgs[i].len != 3 is always false because it is in a code block where msg[i].len is equal to 3. The check is redundant and can be removed.
As detected by cppcheck static analysis:drivers/media/usb/go7007/go7007-i2c.c:168:20: warning: Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]
--- drivers/media/usb/go7007/go7007-i2c.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/usb/go7007/go7007-i2c.c +0 -2
@@ -165,8 +165,6 @@ static int go7007_i2c_master_xfer(struct i2c_adapter *adapter, }else if (msgs[i].len ==3 ) {if (msgs[i].flags &I2C_M_RD )return -EIO ; -if (msgs[i].len !=3 ) -return -EIO ;if (go7007_i2c_xfer (go, msgs[i].addr,0 , (msgs[i].buf[0 ] <<8 ) | msgs[i].buf[1 ],0x01 , &msgs[i].buf[2 ]) <0 )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 176/367 USB: gadget: f_mass_storage: Fix unused variable warning
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
[ Upstream commit 55c3e571d2a0aabef4f1354604443f1c415d2e85 ]
Fix a "variable set but not used" warning in f_mass_storage.c. rc is
used if verbose debugging is enabled but not otherwise.
--- drivers/usb/gadget/function/f_mass_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_mass_storage.c +1 -1
@@ -950,7 +950,7 @@ static void invalidate_sub(struct fsg_lun *curlun) {struct file *filp = curlun->filp;struct inode *inode =file_inode (filp); -unsigned long rc; +unsigned long __maybe_unused rc; rc =invalidate_mapping_pages (inode->i_mapping,0 ,-1 );VLDBG (curlun,"invalidate_mapping_pages -> %ld\n" , rc);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 177/367 media: i2c: ov5640: Configure HVP lines in s_power callback
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lad Prabhakar <[email protected]>
[ Upstream commit 311a6408f8d46d47e35d3bf598dced39af4ce087 ]
Configure HVP lines in s_power callback instead of configuring everytime in ov5640_set_stream_dvp().
Alongside also disable MIPI in DVP mode.
Stable-dep-of: 98cb72d3b9c5 ("media: ov5640: Enable MIPI interface in ov5640_set_power_mipi()")
--- drivers/media/i2c/ov5640.c | 123 +++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 65 deletions(-)
drivers/media/i2c/ov5640.c +58 -65
@@ -1206,71 +1206,6 @@ static int ov5640_set_autogain(struct ov5640_dev *sensor, bool on)static int ov5640_set_stream_dvp (struct ov5640_dev *sensor,bool on) { -int ret; -unsigned int flags = sensor->ep.bus.parallel.flags; -u8 pclk_pol =0 ; -u8 hsync_pol =0 ; -u8 vsync_pol =0 ; - -/* -* Note about parallel port configuration. -* -* When configured in parallel mode, the OV5640 will -* output 10 bits data on DVP data lines [9:0]. -* If only 8 bits data are wanted, the 8 bits data lines -* of the camera interface must be physically connected -* on the DVP data lines [9:2]. -* -* Control lines polarity can be configured through -* devicetree endpoint control lines properties. -* If no endpoint control lines properties are set, -* polarity will be as below: -* - VSYNC: active high -* - HREF: active low -* - PCLK: active low -*/ - -if (on) { -/* -* configure parallel port control lines polarity -* -* POLARITY CTRL0 -* - [5]: PCLK polarity (0: active low, 1: active high) -* - [1]: HREF polarity (0: active low, 1: active high) -* - [0]: VSYNC polarity (mismatch here between -* datasheet and hardware, 0 is active high -* and 1 is active low...) -*/ -if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) - pclk_pol =1 ; -if (flags &V4L2_MBUS_HSYNC_ACTIVE_HIGH ) - hsync_pol =1 ; -if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) - vsync_pol =1 ; - - ret =ov5640_write_reg (sensor, -OV5640_REG_POLARITY_CTRL00 , - (pclk_pol <<5 ) | - (hsync_pol <<1 ) | - vsync_pol); - -if (ret) -return ret; - } - -/* -* powerdown MIPI TX/RX PHY & disable MIPI -* -* MIPI CONTROL 00 -* 4: PWDN PHY TX -* 3: PWDN PHY RX -* 2: MIPI enable -*/ - ret =ov5640_write_reg (sensor, -OV5640_REG_IO_MIPI_CTRL00 , on ?0x18 :0 ); -if (ret) -return ret; -return ov5640_write_reg (sensor,OV5640_REG_SYS_CTRL0 , on ?OV5640_REG_SYS_CTRL0_SW_PWUP :OV5640_REG_SYS_CTRL0_SW_PWDN );
@@ -2029,15 +1964,73 @@ static int ov5640_set_power_mipi(struct ov5640_dev *sensor, bool on)static int ov5640_set_power_dvp (struct ov5640_dev *sensor,bool on) { +unsigned int flags = sensor->ep.bus.parallel.flags; +u8 pclk_pol =0 ; +u8 hsync_pol =0 ; +u8 vsync_pol =0 ;int ret;if (!on) {/* Reset settings to their default values. */ +ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x58 ); +ov5640_write_reg (sensor,OV5640_REG_POLARITY_CTRL00 ,0x20 );ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE01 ,0x00 );ov5640_write_reg (sensor,OV5640_REG_PAD_OUTPUT_ENABLE02 ,0x00 );return 0 ; } +/* +* Note about parallel port configuration. +* +* When configured in parallel mode, the OV5640 will +* output 10 bits data on DVP data lines [9:0]. +* If only 8 bits data are wanted, the 8 bits data lines +* of the camera interface must be physically connected +* on the DVP data lines [9:2]. +* +* Control lines polarity can be configured through +* devicetree endpoint control lines properties. +* If no endpoint control lines properties are set, +* polarity will be as below: +* - VSYNC: active high +* - HREF: active low +* - PCLK: active low +*/ +/* +* configure parallel port control lines polarity +* +* POLARITY CTRL0 +* - [5]: PCLK polarity (0: active low, 1: active high) +* - [1]: HREF polarity (0: active low, 1: active high) +* - [0]: VSYNC polarity (mismatch here between +* datasheet and hardware, 0 is active high +* and 1 is active low...) +*/ +if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) + pclk_pol =1 ; +if (flags &V4L2_MBUS_HSYNC_ACTIVE_HIGH ) + hsync_pol =1 ; +if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) + vsync_pol =1 ; + + ret =ov5640_write_reg (sensor,OV5640_REG_POLARITY_CTRL00 , + (pclk_pol <<5 ) | (hsync_pol <<1 ) | vsync_pol); + +if (ret) +return ret; + +/* +* powerdown MIPI TX/RX PHY & disable MIPI +* +* MIPI CONTROL 00 +* 4: PWDN PHY TX +* 3: PWDN PHY RX +* 2: MIPI enable +*/ + ret =ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x18 ); +if (ret) +return ret; +/* * enable VSYNC/HREF/PCLK DVP control lines * & D[9:6] DVP data lines
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 178/367 media: ov5640: Enable MIPI interface in ov5640_set_power_mipi()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit 98cb72d3b9c5e03b10fa993752ecfcbd9c572d8c ]
Set OV5640_REG_IO_MIPI_CTRL00 bit 2 to 1 instead of 0, since 1 means MIPI CSI2 interface, while 0 means CPI parallel interface.
In the ov5640_set_power_mipi() the interface should obviously be set to MIPI CSI2 since this functions is used to power up the sensor when operated in MIPI CSI2 mode. The sensor should not be in CPI mode in that case.
This fixes a corner case where capturing the first frame on i.MX8MN with CSI/ISI resulted in corrupted frame.
--- drivers/media/i2c/ov5640.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/ov5640.c +2 -2
@@ -1927,9 +1927,9 @@ static int ov5640_set_power_mipi(struct ov5640_dev *sensor, bool on)* "ov5640_set_stream_mipi()") * [4] = 0 : Power up MIPI HS Tx * [3] = 0 : Power up MIPI LS Rx -* [2] = 0 : MIPI interface disabled +* [2] = 1 : MIPI interface enabled */ - ret =ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x40 ); + ret =ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x44 );if (ret)return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 179/367 media: i2c: ov2680: Set V4L2_CTRL_FLAG_MODIFY_LAYOUT on flips
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Stevenson <[email protected]>
[ Upstream commit 66274280b2c745d380508dc27b9a4dfd736e5eda ]
The driver changes the Bayer order based on the flips, but does not define the control correctly with the V4L2_CTRL_FLAG_MODIFY_LAYOUT flag.
Add the V4L2_CTRL_FLAG_MODIFY_LAYOUT flag.
Stable-dep-of: 7b5a42e6ae71 ("media: ov2680: Remove auto-gain and auto-exposure controls")
--- drivers/media/i2c/ov2680.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/i2c/ov2680.c +2 -0
@@ -966,6 +966,8 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) ctrls->gain->flags |=V4L2_CTRL_FLAG_VOLATILE ; ctrls->exposure->flags |=V4L2_CTRL_FLAG_VOLATILE ; + ctrls->vflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; + ctrls->hflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ;v4l2_ctrl_auto_cluster (2 , &ctrls->auto_gain,0 , true);v4l2_ctrl_auto_cluster (2 , &ctrls->auto_exp,1 , true);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 180/367 media: ov2680: Remove auto-gain and auto-exposure controls
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 7b5a42e6ae71927359ea67a2c22570ba97fa4059 ]
Quoting the OV2680 datasheet:
"3.2 exposure and gain control
In the OV2680, the exposure time and gain are set manually from an external controller. The OV2680 supports manual gain and exposure control only for normal applications, no auto mode."
And indeed testing with the atomisp_ov2680 fork of ov2680.c has shown that auto-exposure and auto-gain do not work.
Note that the code setting the auto-exposure flag was broken, callers of ov2680_exposure_set() were directly passing !!ctrls->auto_exp->val as "bool auto_exp" value, but ctrls->auto_exp is a menu control with:
enum v4l2_exposure_auto_type {
V4L2_EXPOSURE_AUTO = 0,
V4L2_EXPOSURE_MANUAL = 1,
...So instead of passing !!ctrls->auto_exp->val they should have been passing ctrls->auto_exp->val == V4L2_EXPOSURE_AUTO, iow the passed value was inverted of what it should have been.
Also remove ov2680_g_volatile_ctrl() since without auto support the gain and exposure controls are not volatile.
This also fixes the control values not being properly applied in ov2680_mode_set(). The 800x600 mode register-list also sets gain, exposure and vflip overriding the last set ctrl values.
ov2680_mode_set() does call ov2680_gain_set() and ov2680_exposure_set() but did this before writing the mode register-list, so these values would still be overridden by the mode register-list.
Add a v4l2_ctrl_handler_setup() call after writing the mode register-list to restore all ctrl values. Also remove the ctrls->gain->is_new check from ov2680_gain_set() so that the gain always gets restored properly.
Last since ov2680_mode_set() now calls v4l2_ctrl_handler_setup(), remove the v4l2_ctrl_handler_setup() call after ov2680_mode_restore() since ov2680_mode_restore() calls ov2680_mode_set().
--- drivers/media/i2c/ov2680.c | 161 ++++--------------------------------- 1 file changed, 17 insertions(+), 144 deletions(-)
drivers/media/i2c/ov2680.c +17 -144
@@ -85,15 +85,8 @@ struct ov2680_mode_info {struct ov2680_ctrls {struct v4l2_ctrl_handler handler; -struct { -struct v4l2_ctrl *auto_exp; -struct v4l2_ctrl *exposure; - }; -struct { -struct v4l2_ctrl *auto_gain; -struct v4l2_ctrl *gain; - }; - +struct v4l2_ctrl *exposure; +struct v4l2_ctrl *gain;struct v4l2_ctrl *hflip;struct v4l2_ctrl *vflip;struct v4l2_ctrl *test_pattern;
@@ -143,6 +136,7 @@ static const struct reg_value ov2680_setting_30fps_QUXGA_800_600[] = { {0x380e, 0x02}, {0x380f, 0x84}, {0x3811, 0x04}, {0x3813, 0x04}, {0x3814, 0x31}, {0x3815, 0x31}, {0x3820, 0xc0}, {0x4008, 0x00}, {0x4009, 0x03}, {0x4837, 0x1e}, {0x3501, 0x4e}, {0x3502, 0xe0}, + {0x3503, 0x03}, }; static const struct reg_value ov2680_setting_30fps_720P_1280_720[] = {
@@ -405,69 +399,15 @@ static int ov2680_test_pattern_set(struct ov2680_dev *sensor, int value)return 0 ; } -static int ov2680_gain_set (struct ov2680_dev *sensor,bool auto_gain) -{ -struct ov2680_ctrls *ctrls = &sensor->ctrls; -u32 gain; -int ret; - - ret =ov2680_mod_reg (sensor,OV2680_REG_R_MANUAL ,BIT (1 ), - auto_gain ?0 :BIT (1 )); -if (ret <0 ) -return ret; - -if (auto_gain || !ctrls->gain->is_new) -return 0 ; - - gain = ctrls->gain->val; - - ret =ov2680_write_reg16 (sensor,OV2680_REG_GAIN_PK , gain); - -return 0 ; -} - -static int ov2680_gain_get (struct ov2680_dev *sensor) -{ -u32 gain; -int ret; - - ret =ov2680_read_reg16 (sensor,OV2680_REG_GAIN_PK , &gain); -if (ret) -return ret; - -return gain; -} - -static int ov2680_exposure_set (struct ov2680_dev *sensor,bool auto_exp) +static int ov2680_gain_set (struct ov2680_dev *sensor,u32 gain) { -struct ov2680_ctrls *ctrls = &sensor->ctrls; -u32 exp; -int ret; - - ret =ov2680_mod_reg (sensor,OV2680_REG_R_MANUAL ,BIT (0 ), - auto_exp ?0 :BIT (0 )); -if (ret <0 ) -return ret; - -if (auto_exp || !ctrls->exposure->is_new) -return 0 ; - - exp = (u32 )ctrls->exposure->val; - exp <<=4 ; - -return ov2680_write_reg24 (sensor,OV2680_REG_EXPOSURE_PK_HIGH , exp); +return ov2680_write_reg16 (sensor,OV2680_REG_GAIN_PK , gain); } -static int ov2680_exposure_get (struct ov2680_dev *sensor) +static int ov2680_exposure_set (struct ov2680_dev *sensor,u32 exp) { -int ret; -u32 exp; - - ret =ov2680_read_reg24 (sensor,OV2680_REG_EXPOSURE_PK_HIGH , &exp); -if (ret) -return ret; - -return exp >>4 ; +return ov2680_write_reg24 (sensor,OV2680_REG_EXPOSURE_PK_HIGH , + exp <<4 ); }static int ov2680_stream_enable (struct ov2680_dev *sensor)
@@ -482,33 +422,17 @@ static int ov2680_stream_disable(struct ov2680_dev *sensor)static int ov2680_mode_set (struct ov2680_dev *sensor) { -struct ov2680_ctrls *ctrls = &sensor->ctrls;int ret; - ret =ov2680_gain_set (sensor, false); -if (ret <0 ) -return ret; - - ret =ov2680_exposure_set (sensor, false); + ret =ov2680_load_regs (sensor, sensor->current_mode);if (ret <0 )return ret; - ret =ov2680_load_regs (sensor, sensor->current_mode); +/* Restore value of all ctrls */ + ret =__v4l2_ctrl_handler_setup (&sensor->ctrls.handler);if (ret <0 )return ret; -if (ctrls->auto_gain->val) { - ret =ov2680_gain_set (sensor, true); -if (ret <0 ) -return ret; - } - -if (ctrls->auto_exp->val ==V4L2_EXPOSURE_AUTO ) { - ret =ov2680_exposure_set (sensor, true); -if (ret <0 ) -return ret; - } - sensor->mode_pending_changes = false;return 0 ;
@@ -590,15 +514,10 @@ static int ov2680_s_power(struct v4l2_subdev *sd, int on)else ret =ov2680_power_off (sensor); -mutex_unlock (&sensor->lock); - -if (on && ret ==0 ) { - ret =v4l2_ctrl_handler_setup (&sensor->ctrls.handler); -if (ret <0 ) -return ret; - +if (on && ret ==0 ) ret =ov2680_mode_restore (sensor); - } + +mutex_unlock (&sensor->lock);return ret; }
@@ -793,52 +712,19 @@ static int ov2680_enum_frame_interval(struct v4l2_subdev *sd,return 0 ; } -static int ov2680_g_volatile_ctrl (struct v4l2_ctrl *ctrl) -{ -struct v4l2_subdev *sd =ctrl_to_sd (ctrl); -struct ov2680_dev *sensor =to_ov2680_dev (sd); -struct ov2680_ctrls *ctrls = &sensor->ctrls; -int val; - -if (!sensor->is_enabled) -return 0 ; - -switch (ctrl->id) { -case V4L2_CID_GAIN : - val =ov2680_gain_get (sensor); -if (val <0 ) -return val; - ctrls->gain->val = val; -break ; -case V4L2_CID_EXPOSURE : - val =ov2680_exposure_get (sensor); -if (val <0 ) -return val; - ctrls->exposure->val = val; -break ; - } - -return 0 ; -} -static int ov2680_s_ctrl (struct v4l2_ctrl *ctrl) {struct v4l2_subdev *sd =ctrl_to_sd (ctrl);struct ov2680_dev *sensor =to_ov2680_dev (sd); -struct ov2680_ctrls *ctrls = &sensor->ctrls;if (!sensor->is_enabled)return 0 ;switch (ctrl->id) { -case V4L2_CID_AUTOGAIN : -return ov2680_gain_set (sensor, !!ctrl->val);case V4L2_CID_GAIN : -return ov2680_gain_set (sensor, !!ctrls->auto_gain->val); -case V4L2_CID_EXPOSURE_AUTO : -return ov2680_exposure_set (sensor, !!ctrl->val); +return ov2680_gain_set (sensor, ctrl->val);case V4L2_CID_EXPOSURE : -return ov2680_exposure_set (sensor, !!ctrls->auto_exp->val); +return ov2680_exposure_set (sensor, ctrl->val);case V4L2_CID_VFLIP :if (sensor->is_streaming)return -EBUSY ;
@@ -863,7 +749,6 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl) }static const struct v4l2_ctrl_ops ov2680_ctrl_ops = { - .g_volatile_ctrl = ov2680_g_volatile_ctrl, .s_ctrl = ov2680_s_ctrl, };
@@ -935,7 +820,7 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)if (ret <0 )return ret; -v4l2_ctrl_handler_init (hdl,7 ); +v4l2_ctrl_handler_init (hdl,5 ); hdl->lock = &sensor->lock;
@@ -947,16 +832,9 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)ARRAY_SIZE (test_pattern_menu) -1 , 0, 0, test_pattern_menu); - ctrls->auto_exp =v4l2_ctrl_new_std_menu (hdl, ops, -V4L2_CID_EXPOSURE_AUTO , -V4L2_EXPOSURE_MANUAL ,0 , -V4L2_EXPOSURE_AUTO ); - ctrls->exposure =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_EXPOSURE ,0 ,32767 ,1 ,0 ); - ctrls->auto_gain =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_AUTOGAIN , -0 ,1 ,1 ,1 ); ctrls->gain =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_GAIN ,0 ,2047 ,1 ,0 );if (hdl->error) {
@@ -964,14 +842,9 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) goto cleanup_entity; } - ctrls->gain->flags |=V4L2_CTRL_FLAG_VOLATILE ; - ctrls->exposure->flags |=V4L2_CTRL_FLAG_VOLATILE ; ctrls->vflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; ctrls->hflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; -v4l2_ctrl_auto_cluster (2 , &ctrls->auto_gain,0 , true); -v4l2_ctrl_auto_cluster (2 , &ctrls->auto_exp,1 , true); - sensor->sd.ctrl_handler = hdl; ret =v4l2_async_register_subdev (&sensor->sd);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 181/367 media: ov2680: Fix ov2680_bayer_order()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 50a7bad4e0a37d7018ab6fe843dd84bc6b2ecf72 ]
The index into ov2680_hv_flip_bayer_order[] should be 0-3, but ov2680_bayer_order() was using 0 + BIT(2) + (BIT(2) << 1) as max index, while the intention was to use: 0 + 1 + 2 as max index.
Fix the index calculation in ov2680_bayer_order(), while at it also just use the ctrl values rather then reading them back using a slow i2c-read transaction.
This also allows making the function void, since there now are no more i2c-reads to error check.
Note the check for the ctrls being NULL is there to allow adding an ov2680_fill_format() helper later, which will call ov2680_set_bayer_order() during probe() before the ctrls are created.
[Sakari Ailus: Change all users of ov2680_set_bayer_order() here]
--- drivers/media/i2c/ov2680.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-)
drivers/media/i2c/ov2680.c +14 -19
@@ -315,26 +315,17 @@ static void ov2680_power_down(struct ov2680_dev *sensor)usleep_range (5000 ,10000 ); } -static int ov2680_bayer_order (struct ov2680_dev *sensor) +static void ov2680_set_bayer_order (struct ov2680_dev *sensor) { -u32 format1; -u32 format2; -u32 hv_flip; -int ret; - - ret =ov2680_read_reg (sensor,OV2680_REG_FORMAT1 , &format1); -if (ret <0 ) -return ret; +int hv_flip =0 ; - ret =ov2680_read_reg (sensor,OV2680_REG_FORMAT2 , &format2); -if (ret <0 ) -return ret; +if (sensor->ctrls.vflip && sensor->ctrls.vflip->val) + hv_flip +=1 ; - hv_flip = (format2 &BIT (2 ) <<1 ) | (format1 &BIT (2 )); +if (sensor->ctrls.hflip && sensor->ctrls.hflip->val) + hv_flip +=2 ; sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip]; - -return 0 ; }static int ov2680_vflip_enable (struct ov2680_dev *sensor)
@@ -345,7 +336,8 @@ static int ov2680_vflip_enable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_vflip_disable (struct ov2680_dev *sensor)
@@ -356,7 +348,8 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_hflip_enable (struct ov2680_dev *sensor)
@@ -367,7 +360,8 @@ static int ov2680_hflip_enable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_hflip_disable (struct ov2680_dev *sensor)
@@ -378,7 +372,8 @@ static int ov2680_hflip_disable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_test_pattern_set (struct ov2680_dev *sensor,int value)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 182/367 media: ov2680: Fix vflip / hflip set functions
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit d5d08ad330c9ccebc5e066fda815423a290f48b0 ]
ov2680_vflip_disable() / ov2680_hflip_disable() pass BIT(0) instead of 0 as value to ov2680_mod_reg().
While fixing this also:
1. Stop having separate enable/disable functions for hflip / vflip
2. Move the is_streaming check, which is unique to hflip / vflip into the ov2680_set_?flip() functions.
for a nice code cleanup.
--- drivers/media/i2c/ov2680.c | 50 +++++++++----------------------------- 1 file changed, 12 insertions(+), 38 deletions(-)
drivers/media/i2c/ov2680.c +12 -38
@@ -328,23 +328,15 @@ static void ov2680_set_bayer_order(struct ov2680_dev *sensor) sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip]; } -static int ov2680_vflip_enable (struct ov2680_dev *sensor) +static int ov2680_set_vflip (struct ov2680_dev *sensor,s32 val) {int ret; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT1 ,BIT (2 ),BIT (2 )); -if (ret <0 ) -return ret; - -ov2680_set_bayer_order (sensor); -return 0 ; -} - -static int ov2680_vflip_disable (struct ov2680_dev *sensor) -{ -int ret; +if (sensor->is_streaming) +return -EBUSY ; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT1 ,BIT (2 ),BIT (0 )); + ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT1 , +BIT (2 ), val ?BIT (2 ) :0 );if (ret <0 )return ret;
@@ -352,23 +344,15 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor)return 0 ; } -static int ov2680_hflip_enable (struct ov2680_dev *sensor) +static int ov2680_set_hflip (struct ov2680_dev *sensor,s32 val) {int ret; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT2 ,BIT (2 ),BIT (2 )); -if (ret <0 ) -return ret; - -ov2680_set_bayer_order (sensor); -return 0 ; -} - -static int ov2680_hflip_disable (struct ov2680_dev *sensor) -{ -int ret; +if (sensor->is_streaming) +return -EBUSY ; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT2 ,BIT (2 ),BIT (0 )); + ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT2 , +BIT (2 ), val ?BIT (2 ) :0 );if (ret <0 )return ret;
@@ -721,19 +705,9 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_EXPOSURE :return ov2680_exposure_set (sensor, ctrl->val);case V4L2_CID_VFLIP : -if (sensor->is_streaming) -return -EBUSY ; -if (ctrl->val) -return ov2680_vflip_enable (sensor); -else -return ov2680_vflip_disable (sensor); +return ov2680_set_vflip (sensor, ctrl->val);case V4L2_CID_HFLIP : -if (sensor->is_streaming) -return -EBUSY ; -if (ctrl->val) -return ov2680_hflip_enable (sensor); -else -return ov2680_hflip_disable (sensor); +return ov2680_set_hflip (sensor, ctrl->val);case V4L2_CID_TEST_PATTERN :return ov2680_test_pattern_set (sensor, ctrl->val);default :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 183/367 media: ov2680: Fix regulators being left enabled on ov2680_power_on() errors
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 84b4bd7e0d98166aa32fd470e672721190492eae ]
When the ov2680_power_on() "sensor soft reset failed" path is hit during probe() the WARN() about putting an enabled regulator at drivers/regulator/core.c:2398 triggers 3 times (once for each regulator), filling dmesg with backtraces.
Fix this by properly disabling the regulators on ov2680_power_on() errors.
--- drivers/media/i2c/ov2680.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/i2c/ov2680.c +6 -2
@@ -459,7 +459,7 @@ static int ov2680_power_on(struct ov2680_dev *sensor) ret =ov2680_write_reg (sensor,OV2680_REG_SOFT_RESET ,0x01 );if (ret !=0 ) {dev_err (dev,"sensor soft reset failed\n" ); -return ret; + goto err_disable_regulators; }usleep_range (1000 ,2000 ); }else {
@@ -469,7 +469,7 @@ static int ov2680_power_on(struct ov2680_dev *sensor) ret =clk_prepare_enable (sensor->xvclk);if (ret <0 ) -return ret; + goto err_disable_regulators; sensor->is_enabled = true;
@@ -479,6 +479,10 @@ static int ov2680_power_on(struct ov2680_dev *sensor)ov2680_stream_disable (sensor);return 0 ; + +err_disable_regulators: +regulator_bulk_disable (OV2680_NUM_SUPPLIES , sensor->supplies); +return ret; }static int ov2680_s_power (struct v4l2_subdev *sd,int on)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 184/367 scsi: core: Use 32-bit hostnum in scsi_host_lookup()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Battersby <[email protected]>
[ Upstream commit 62ec2092095b678ff89ce4ba51c2938cd1e8e630 ]
Change scsi_host_lookup() hostnum argument type from unsigned short to unsigned int to match the type used everywhere else.
--- drivers/scsi/hosts.c | 4 ++-- include/scsi/scsi_host.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/hosts.c +2 -2
@@ -518,7 +518,7 @@ EXPORT_SYMBOL(scsi_host_alloc);static int __scsi_host_match (struct device *dev,const void *data) {struct Scsi_Host *p; -const unsigned short *hostnum = data; +const unsigned int *hostnum = data; p =class_to_shost (dev);return p->host_no == *hostnum;
@@ -535,7 +535,7 @@ static int __scsi_host_match(struct device *dev, const void *data)* that scsi_host_get() took. The put_device() below dropped * the reference from class_find_device(). **/ -struct Scsi_Host *scsi_host_lookup (unsigned short hostnum) +struct Scsi_Host *scsi_host_lookup (unsigned int hostnum) {struct device *cdev;struct Scsi_Host *shost =NULL ;
include/scsi/scsi_host.h +1 -1
@@ -744,7 +744,7 @@ extern void scsi_remove_host(struct Scsi_Host *);extern struct Scsi_Host *scsi_host_get (struct Scsi_Host *);extern int scsi_host_busy (struct Scsi_Host *shost);extern void scsi_host_put (struct Scsi_Host *t); -extern struct Scsi_Host *scsi_host_lookup (unsigned short ); +extern struct Scsi_Host *scsi_host_lookup (unsigned int hostnum);extern const char *scsi_host_state_name (enum scsi_host_state ); static inline int __must_check scsi_add_host(struct Scsi_Host *host,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 185/367 scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengfeng Ye <[email protected]>
[ Upstream commit 1a1975551943f681772720f639ff42fbaa746212 ]
There is a long call chain that &fip->ctlr_lock is acquired by isr fnic_isr_msix_wq_copy() under hard IRQ context. Thus other process context code acquiring the lock should disable IRQ, otherwise deadlock could happen if the IRQ preempts the execution while the lock is held in process context on the same CPU.
[ISR]fnic_isr_msix_wq_copy()
-> fnic_wq_copy_cmpl_handler()
-> fnic_fcpio_cmpl_handler()
-> fnic_fcpio_flogi_reg_cmpl_handler()
-> fnic_flush_tx()
-> fnic_send_frame()
-> fcoe_ctlr_els_send()
-> spin_lock_bh(&fip->ctlr_lock)
[Process Context]
1. fcoe_ctlr_timer_work()
-> fcoe_ctlr_flogi_send()
-> spin_lock_bh(&fip->ctlr_lock)
2. fcoe_ctlr_recv_work()
-> fcoe_ctlr_recv_handler()
-> fcoe_ctlr_recv_els()
-> fcoe_ctlr_announce()
-> spin_lock_bh(&fip->ctlr_lock)
3. fcoe_ctlr_recv_work()
-> fcoe_ctlr_recv_handler()
-> fcoe_ctlr_recv_els()
-> fcoe_ctlr_flogi_retry()
-> spin_lock_bh(&fip->ctlr_lock)
4. -> fcoe_xmit()
-> fcoe_ctlr_els_send()
-> spin_lock_bh(&fip->ctlr_lock)
spin_lock_bh() is not enough since fnic_isr_msix_wq_copy() is a hardirq.
These flaws were found by an experimental static analysis tool I am developing for irq-related deadlock.
The patch fix the potential deadlocks by spin_lock_irqsave() to disable hard irq.
--- drivers/scsi/fcoe/fcoe_ctlr.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/scsi/fcoe/fcoe_ctlr.c +12 -8
@@ -318,16 +318,17 @@ static void fcoe_ctlr_announce(struct fcoe_ctlr *fip) {struct fcoe_fcf *sel;struct fcoe_fcf *fcf; +unsigned long flags;mutex_lock (&fip->ctlr_mutex); -spin_lock_bh (&fip->ctlr_lock); +spin_lock_irqsave (&fip->ctlr_lock, flags);kfree_skb (fip->flogi_req); fip->flogi_req =NULL ;list_for_each_entry (fcf, &fip->fcfs, list) fcf->flogi_sent =0 ; -spin_unlock_bh (&fip->ctlr_lock); +spin_unlock_irqrestore (&fip->ctlr_lock, flags); sel = fip->sel_fcf;if (sel &ðer_addr_equal (sel->fcf_mac, fip->dest_addr))
@@ -697,6 +698,7 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport, {struct fc_frame *fp;struct fc_frame_header *fh; +unsigned long flags;u16 old_xid;u8 op;u8 mac[ETH_ALEN ];
@@ -730,11 +732,11 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport, op =FIP_DT_FLOGI ;if (fip->mode ==FIP_MODE_VN2VN )break ; -spin_lock_bh (&fip->ctlr_lock); +spin_lock_irqsave (&fip->ctlr_lock, flags);kfree_skb (fip->flogi_req); fip->flogi_req = skb; fip->flogi_req_send =1 ; -spin_unlock_bh (&fip->ctlr_lock); +spin_unlock_irqrestore (&fip->ctlr_lock, flags);schedule_work (&fip->timer_work);return -EINPROGRESS ;case ELS_FDISC :
@@ -1711,10 +1713,11 @@ static int fcoe_ctlr_flogi_send_locked(struct fcoe_ctlr *fip)static int fcoe_ctlr_flogi_retry (struct fcoe_ctlr *fip) {struct fcoe_fcf *fcf; +unsigned long flags;int error;mutex_lock (&fip->ctlr_mutex); -spin_lock_bh (&fip->ctlr_lock); +spin_lock_irqsave (&fip->ctlr_lock, flags);LIBFCOE_FIP_DBG (fip,"re-sending FLOGI - reselect\n" ); fcf =fcoe_ctlr_select (fip);if (!fcf || fcf->flogi_sent) {
@@ -1725,7 +1728,7 @@ static int fcoe_ctlr_flogi_retry(struct fcoe_ctlr *fip)fcoe_ctlr_solicit (fip,NULL ); error =fcoe_ctlr_flogi_send_locked (fip); } -spin_unlock_bh (&fip->ctlr_lock); +spin_unlock_irqrestore (&fip->ctlr_lock, flags);mutex_unlock (&fip->ctlr_mutex);return error; }
@@ -1742,8 +1745,9 @@ static int fcoe_ctlr_flogi_retry(struct fcoe_ctlr *fip)static void fcoe_ctlr_flogi_send (struct fcoe_ctlr *fip) {struct fcoe_fcf *fcf; +unsigned long flags; -spin_lock_bh (&fip->ctlr_lock); +spin_lock_irqsave (&fip->ctlr_lock, flags); fcf = fip->sel_fcf;if (!fcf || !fip->flogi_req_send) goto unlock;
@@ -1770,7 +1774,7 @@ static void fcoe_ctlr_flogi_send(struct fcoe_ctlr *fip) }else /* XXX */ LIBFCOE_FIP_DBG (fip,"No FCF selected - defer send\n" ); unlock: -spin_unlock_bh (&fip->ctlr_lock); +spin_unlock_irqrestore (&fip->ctlr_lock, flags); }/**
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 186/367 serial: tegra: handle clk prepare error in tegra_uart_hw_init()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yi Yang <[email protected]>
[ Upstream commit 5abd01145d0cc6cd1b7c2fe6ee0b9ea0fa13671e ]
In tegra_uart_hw_init(), the return value of clk_prepare_enable() should be checked since it might fail.
--- drivers/tty/serial/serial-tegra.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/tty/serial/serial-tegra.c +5 -1
@@ -1000,7 +1000,11 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup) tup->ier_shadow =0 ; tup->current_baud =0 ; -clk_prepare_enable (tup->uart_clk); + ret =clk_prepare_enable (tup->uart_clk); +if (ret) { +dev_err (tup->uport.dev,"could not enable clk\n" ); +return ret; + }/* Reset the UART controller to clear all previous status.*/ reset_control_assert (tup->rst);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 187/367 amba: bus: fix refcount leak
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit e312cbdc11305568554a9e18a2ea5c2492c183f3 ]
commit 5de1540b7bc4 ("drivers/amba: create devices from device tree") increases the refcount of of_node, but not releases it in amba_device_release, so there is refcount leak. By using of_node_put to avoid refcount leak.
--- drivers/amba/bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/amba/bus.c +1 -0
@@ -364,6 +364,7 @@ static void amba_device_release(struct device *dev) {struct amba_device *d =to_amba_device (dev); +of_node_put (d->dev.of_node);if (d->res.parent)release_resource (&d->res);kfree (d);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 188/367 Revert "IB/isert: Fix incorrect release of isert connection"
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit dfe261107c080709459c32695847eec96238852b ]
Commit: 699826f4e30a ("IB/isert: Fix incorrect release of isert connection") is causing problems on OPA when DEVICE_REMOVAL is happening.
------------[ cut here ]------------ WARNING: CPU: 52 PID: 2117247 at drivers/infiniband/core/cq.c:359 ib_cq_pool_cleanup+0xac/0xb0 [ib_core] Modules linked in: nfsd nfs_acl target_core_user uio tcm_fc libfc
scsi_transport_fc tcm_loop target_core_pscsi target_core_iblock target_core_file rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver nfs lockd grace fscache netfs rfkill rpcrdma rdma_ucm ib_srpt sunrpc ib_isert iscsi_target_mod target_core_mod opa_vnic ib_iser libiscsi ib_umad scsi_transport_iscsi rdma_cm ib_ipoib iw_cm ib_cm hfi1(-) rdmavt ib_uverbs intel_rapl_msr intel_rapl_common sb_edac ib_core x86_pkg_temp_thermal intel_powerclamp coretemp i2c_i801 mxm_wmi rapl iTCO_wdt ipmi_si iTCO_vendor_support mei_me ipmi_devintf mei intel_cstate ioatdma intel_uncore i2c_smbus joydev pcspkr lpc_ich ipmi_msghandler acpi_power_meter acpi_pad xfs libcrc32c sr_mod sd_mod cdrom t10_pi sg crct10dif_pclmul crc32_pclmul crc32c_intel drm_kms_helper drm_shmem_helper ahci libahci ghash_clmulni_intel igb drm libata dca i2c_algo_bit wmi fuse
CPU: 52 PID: 2117247 Comm: modprobe Not tainted 6.5.0-rc1+ #1 Hardware name: Intel Corporation S2600CWR/S2600CW, BIOS SE5C610.86B.01.01.0014.121820151719 12/18/2015 RIP: 0010:ib_cq_pool_cleanup+0xac/0xb0 [ib_core] Code: ff 48 8b 43 40 48 8d 7b 40 48 83 e8 40 4c 39 e7 75 b3 49 83
c4 10 4d 39 fc 75 94 5b 5d 41 5c 41 5d 41 5e 41 5f c3 cc cc cc cc <0f> 0b eb a1 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f
RSP: 0018:ffffc10bea13fc80 EFLAGS: 00010206
RAX: 000000000000010c RBX: ffff9bf5c7e66c00 RCX: 000000008020001d
RDX: 000000008020001e RSI: fffff175221f9900 RDI: ffff9bf5c7e67640
RBP: ffff9bf5c7e67600 R08: ffff9bf5c7e64400 R09: 000000008020001d
R10: 0000000040000000 R11: 0000000000000000 R12: ffff9bee4b1e8a18
R13: dead000000000122 R14: dead000000000100 R15: ffff9bee4b1e8a38
FS: 00007ff1e6d38740(0000) GS:ffff9bfd9fb00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00005652044ecc68 CR3: 0000000889b5c005 CR4: 00000000001706e0
Call Trace: <TASK> ? __warn+0x80/0x130 ? ib_cq_pool_cleanup+0xac/0xb0 [ib_core] ? report_bug+0x195/0x1a0 ? handle_bug+0x3c/0x70 ? exc_invalid_op+0x14/0x70 ? asm_exc_invalid_op+0x16/0x20 ? ib_cq_pool_cleanup+0xac/0xb0 [ib_core] disable_device+0x9d/0x160 [ib_core] __ib_unregister_device+0x42/0xb0 [ib_core] ib_unregister_device+0x22/0x30 [ib_core] rvt_unregister_device+0x20/0x90 [rdmavt] hfi1_unregister_ib_device+0x16/0xf0 [hfi1] remove_one+0x55/0x1a0 [hfi1] pci_device_remove+0x36/0xa0 device_release_driver_internal+0x193/0x200 driver_detach+0x44/0x90 bus_remove_driver+0x69/0xf0 pci_unregister_driver+0x2a/0xb0 hfi1_mod_cleanup+0xc/0x3c [hfi1] __do_sys_delete_module.constprop.0+0x17a/0x2f0 ? exit_to_user_mode_prepare+0xc4/0xd0 ? syscall_trace_enter.constprop.0+0x126/0x1a0 do_syscall_64+0x5c/0x90 ? syscall_exit_to_user_mode+0x12/0x30 ? do_syscall_64+0x69/0x90 ? syscall_exit_work+0x103/0x130 ? syscall_exit_to_user_mode+0x12/0x30 ? do_syscall_64+0x69/0x90 ? exc_page_fault+0x65/0x150 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 RIP: 0033:0x7ff1e643f5ab Code: 73 01 c3 48 8b 0d 75 a8 1b 00 f7 d8 64 89 01 48 83 c8 ff c3
66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 45 a8 1b 00 f7 d8 64 89 01 48
RSP: 002b:00007ffec9103cc8 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0
RAX: ffffffffffffffda RBX: 00005615267fdc50 RCX: 00007ff1e643f5ab
RDX: 0000000000000000 RSI: 0000000000000800 RDI: 00005615267fdcb8
RBP: 00005615267fdc50 R08: 0000000000000000 R09: 0000000000000000
R10: 00007ff1e659eac0 R11: 0000000000000206 R12: 00005615267fdcb8
R13: 0000000000000000 R14: 00005615267fdcb8 R15: 00007ffec9105ff8
</TASK> ---[ end trace 0000000000000000 ]---
And...
restrack: ------------[ cut here ]------------ infiniband hfi1_0: BUG: RESTRACK detected leak of resources
restrack: Kernel PD object allocated by ib_isert is not freed
restrack: Kernel CQ object allocated by ib_core is not freed
restrack: Kernel QP object allocated by rdma_cm is not freed
restrack: ------------[ cut here ]------------
--- drivers/infiniband/ulp/isert/ib_isert.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/ulp/isert/ib_isert.c +2 -0
@@ -2646,6 +2646,8 @@ static void isert_wait_conn(struct iscsi_conn *conn)isert_put_unsol_pending_cmds (conn);isert_wait4cmds (conn);isert_wait4logout (isert_conn); + +queue_work (isert_release_wq, &isert_conn->release_work); }static void isert_free_conn (struct iscsi_conn *conn)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 189/367 RDMA/siw: Balance the reference of cep->kref in the error path
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoqing Jiang <[email protected]>
[ Upstream commit b056327bee09e6b86683d3f709a438ccd6031d72 ]
The siw_connect can go to err in below after cep is allocated successfully:
1. If siw_cm_alloc_work returns failure. In this case socket is not assoicated with cep so siw_cep_put can't be called by siw_socket_disassoc. We need to call siw_cep_put twice since cep->kref is increased once after it was initialized.
2. If siw_cm_queue_work can't find a work, which means siw_cep_get is not called in siw_cm_queue_work, so cep->kref is increased twice by siw_cep_get and when associate socket with cep after it was initialized. So we need to call siw_cep_put three times (one in siw_socket_disassoc).
3. siw_send_mpareqrep returns error, this scenario is similar as 2.
So we need to remove one siw_cep_put in the error path.
--- drivers/infiniband/sw/siw/siw_cm.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/sw/siw/siw_cm.c +0 -1
@@ -1525,7 +1525,6 @@ int siw_connect(struct iw_cm_id *id, struct iw_cm_conn_param *params) cep->cm_id =NULL ; id->rem_ref (id); -siw_cep_put (cep); qp->cep =NULL ;siw_cep_put (cep);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 190/367 RDMA/siw: Correct wrong debug message
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoqing Jiang <[email protected]>
[ Upstream commit bee024d20451e4ce04ea30099cad09f7f75d288b ]
We need to print num_sle first then pbl->max_buf per the condition. Also replace mem->pbl with pbl while at it.
--- drivers/infiniband/sw/siw/siw_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/siw/siw_verbs.c +1 -1
@@ -1509,7 +1509,7 @@ int siw_map_mr_sg(struct ib_mr *base_mr, struct scatterlist *sl, int num_sle,if (pbl->max_buf < num_sle) {siw_dbg_mem (mem,"too many SGE's: %d > %d\n" , - mem->pbl->max_buf, num_sle); + num_sle, pbl->max_buf);return -ENOMEM ; }for_each_sg (sl, slp, num_sle, i) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 191/367 HID: logitech-dj: Fix error handling in logi_dj_recv_switch_to_dj_mode()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit 6f20d3261265885f6a6be4cda49d7019728760e0 ]
Presently, if a call to logi_dj_recv_send_report() fails, we do not learn about the error until after sending short HID_OUTPUT_REPORT with hid_hw_raw_request().
To handle this somewhat unlikely issue, return on error in logi_dj_recv_send_report() (minding ugly sleep workaround) and take into account the result of hid_hw_raw_request().
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/hid/hid-logitech-dj.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/hid-logitech-dj.c +4 -1
@@ -1212,6 +1212,9 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,* 50 msec should gives enough time to the receiver to be ready. */ msleep (50 ); + +if (retval) +return retval; }/*
@@ -1233,7 +1236,7 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, buf[5 ] =0x09 ; buf[6 ] =0x00 ; -hid_hw_raw_request (hdev,REPORT_ID_HIDPP_SHORT , buf, + retval =hid_hw_raw_request (hdev,REPORT_ID_HIDPP_SHORT , buf,HIDPP_REPORT_SHORT_LENGTH ,HID_OUTPUT_REPORT ,HID_REQ_SET_REPORT );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 192/367 HID: multitouch: Correct devm device reference for hidinput input_dev name
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rahul Rameshbabu <[email protected]>
[ Upstream commit 4794394635293a3e74591351fff469cea7ad15a2 ]
Reference the HID device rather than the input device for the devm allocation of the input_dev name. Referencing the input_dev would lead to a use-after-free when the input_dev was unregistered and subsequently fires a uevent that depends on the name. At the point of firing the uevent, the name would be freed by devres management.
Use devm_kasprintf to simplify the logic for allocating memory and formatting the input_dev name string.
--- drivers/hid/hid-multitouch.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/hid/hid-multitouch.c +3 -10
@@ -1548,7 +1548,6 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app)static int mt_input_configured (struct hid_device *hdev,struct hid_input *hi) {struct mt_device *td =hid_get_drvdata (hdev); -char *name;const char *suffix =NULL ;struct mt_report_data *rdata;struct mt_application *mt_application =NULL ;
@@ -1602,15 +1601,9 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)break ; } -if (suffix) { - name =devm_kzalloc (&hi->input->dev, -strlen (hdev->name) +strlen (suffix) +2 , -GFP_KERNEL ); -if (name) { -sprintf (name,"%s %s" , hdev->name, suffix); - hi->input->name = name; - } - } +if (suffix) + hi->input->name =devm_kasprintf (&hdev->dev,GFP_KERNEL , +"%s %s" , hdev->name, suffix);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 193/367 x86/speculation: Mark all Skylake CPUs as vulnerable to GDS
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Hansen <[email protected]>
[ Upstream commit c9f4c45c8ec3f07f4f083f9750032a1ec3eab6b2 ]
The Gather Data Sampling (GDS) vulnerability is common to all Skylake processors. However, the "client" Skylakes* are now in this list:
https://www.intel.com/content/www/us/en/support/articles/000022396/processors.html
which means they are no longer included for new vulnerabilities here:
or in other GDS documentation. Thus, they were not included in the original GDS mitigation patches.
Mark SKYLAKE and SKYLAKE_L as vulnerable to GDS to match all the other Skylake CPUs (which include Kaby Lake). Also group the CPUs so that the ones that share the exact same vulnerabilities are next to each other.
Last, move SRBDS to the end of each line. This makes it clear at a glance that SKYLAKE_X is unique. Of the five Skylakes, it is the only "server" CPU and has a different implementation from the clients of the "special register" hardware, making it immune to SRBDS.
This makes the diff much harder to read, but the resulting table is worth it.
I very much appreciate the report from Michael Zhivich about this issue. Despite what level of support a hardware vendor is providing, the kernel very much needs an accurate and up-to-date list of vulnerable CPUs. More reports like this are very welcome.
* Client Skylakes are CPUID 406E3/506E3 which is family 6, models 0x4E and 0x5E, aka INTEL_FAM6_SKYLAKE and INTEL_FAM6_SKYLAKE_L.
--- arch/x86/kernel/cpu/common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/common.c +4 -4
@@ -1147,11 +1147,11 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {VULNBL_INTEL_STEPPINGS (BROADWELL_G ,X86_STEPPING_ANY ,SRBDS ),VULNBL_INTEL_STEPPINGS (BROADWELL_X ,X86_STEPPING_ANY ,MMIO ),VULNBL_INTEL_STEPPINGS (BROADWELL ,X86_STEPPING_ANY ,SRBDS ), -VULNBL_INTEL_STEPPINGS (SKYLAKE_L ,X86_STEPPING_ANY ,SRBDS |MMIO |RETBLEED ),VULNBL_INTEL_STEPPINGS (SKYLAKE_X ,X86_STEPPING_ANY ,MMIO |RETBLEED |GDS ), -VULNBL_INTEL_STEPPINGS (SKYLAKE ,X86_STEPPING_ANY ,SRBDS |MMIO |RETBLEED ), -VULNBL_INTEL_STEPPINGS (KABYLAKE_L ,X86_STEPPING_ANY ,SRBDS |MMIO |RETBLEED |GDS ), -VULNBL_INTEL_STEPPINGS (KABYLAKE ,X86_STEPPING_ANY ,SRBDS |MMIO |RETBLEED |GDS ), +VULNBL_INTEL_STEPPINGS (SKYLAKE_L ,X86_STEPPING_ANY ,MMIO |RETBLEED |GDS |SRBDS ), +VULNBL_INTEL_STEPPINGS (SKYLAKE ,X86_STEPPING_ANY ,MMIO |RETBLEED |GDS |SRBDS ), +VULNBL_INTEL_STEPPINGS (KABYLAKE_L ,X86_STEPPING_ANY ,MMIO |RETBLEED |GDS |SRBDS ), +VULNBL_INTEL_STEPPINGS (KABYLAKE ,X86_STEPPING_ANY ,MMIO |RETBLEED |GDS |SRBDS ),VULNBL_INTEL_STEPPINGS (CANNONLAKE_L ,X86_STEPPING_ANY ,RETBLEED ),VULNBL_INTEL_STEPPINGS (ICELAKE_L ,X86_STEPPING_ANY ,MMIO |MMIO_SBDS |RETBLEED |GDS ), VULNBL_INTEL_STEPPINGS(ICELAKE_D, X86_STEPPING_ANY, MMIO | GDS),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 194/367 tracing: Fix race issue between cpu buffer write and swap
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yejian <[email protected]>
[ Upstream commit 3163f635b20e9e1fb4659e74f47918c9dddfe64e ]
Warning happened in rb_end_commit() at code:
if (RB_WARN_ON(cpu_buffer, !local_read(&cpu_buffer->committing)))
WARNING: CPU: 0 PID: 139 at kernel/trace/ring_buffer.c:3142 rb_commit+0x402/0x4a0 Call Trace: ring_buffer_unlock_commit+0x42/0x250 trace_buffer_unlock_commit_regs+0x3b/0x250 trace_event_buffer_commit+0xe5/0x440 trace_event_buffer_reserve+0x11c/0x150 trace_event_raw_event_sched_switch+0x23c/0x2c0 __traceiter_sched_switch+0x59/0x80 __schedule+0x72b/0x1580 schedule+0x92/0x120 worker_thread+0xa0/0x6f0
It is because the race between writing event into cpu buffer and swapping cpu buffer through file per_cpu/cpu0/snapshot:
Write on CPU 0 Swap buffer by per_cpu/cpu0/snapshot on CPU 1
-------- --------
tracing_snapshot_write()
[...] ring_buffer_lock_reserve()
cpu_buffer = buffer->buffers[cpu]; // 1. Suppose find 'cpu_buffer_a';
[...]
rb_reserve_next_event()
[...] ring_buffer_swap_cpu()
if (local_read(&cpu_buffer_a->committing))
goto out_dec;
if (local_read(&cpu_buffer_b->committing))
goto out_dec;
buffer_a->buffers[cpu] = cpu_buffer_b;
buffer_b->buffers[cpu] = cpu_buffer_a;
// 2. cpu_buffer has swapped here.
rb_start_commit(cpu_buffer);
if (unlikely(READ_ONCE(cpu_buffer->buffer)
!= buffer)) { // 3. This check passed due to 'cpu_buffer->buffer'
[...] // has not changed here.
return NULL;
}
cpu_buffer_b->buffer = buffer_a;
cpu_buffer_a->buffer = buffer_b;
[...]
// 4. Reserve event from 'cpu_buffer_a'. ring_buffer_unlock_commit()
[...]
cpu_buffer = buffer->buffers[cpu]; // 5. Now find 'cpu_buffer_b' !!!
rb_commit(cpu_buffer)
rb_end_commit() // 6. WARN for the wrong 'committing' state !!!Based on above analysis, we can easily reproduce by following testcase:
``` bash
#!/bin/bash
dmesg -n 7
sysctl -w kernel.panic_on_warn=1
TR=/sys/kernel/tracing
echo 7 > ${TR}/buffer_size_kb
echo "sched:sched_switch" > ${TR}/set_event
while [ true ]; do
echo 1 > ${TR}/per_cpu/cpu0/snapshot
done &
while [ true ]; do
echo 1 > ${TR}/per_cpu/cpu0/snapshot
done &
while [ true ]; do
echo 1 > ${TR}/per_cpu/cpu0/snapshot
done &
```To fix it, IIUC, we can use smp_call_function_single() to do the swap on the target cpu where the buffer is located, so that above race would be avoided.
--- kernel/trace/trace.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
kernel/trace/trace.c +12 -5
@@ -6791,6 +6791,11 @@ static int tracing_snapshot_open(struct inode *inode, struct file *file)return ret; } +static void tracing_swap_cpu_buffer (void *tr) +{ +update_max_tr_single ((struct trace_array *)tr, current,smp_processor_id ()); +} +static ssize_t tracing_snapshot_write (struct file *filp,const char __user *ubuf,size_t cnt,loff_t *ppos)
@@ -6849,13 +6854,15 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt, ret =tracing_alloc_snapshot_instance (tr);if (ret <0 )break ; -local_irq_disable ();/* Now, we're going to swap */ -if (iter->cpu_file ==RING_BUFFER_ALL_CPUS ) +if (iter->cpu_file ==RING_BUFFER_ALL_CPUS ) { +local_irq_disable ();update_max_tr (tr, current,smp_processor_id (),NULL ); -else -update_max_tr_single (tr, current, iter->cpu_file); -local_irq_enable (); +local_irq_enable (); + }else { +smp_call_function_single (iter->cpu_file, tracing_swap_cpu_buffer, + (void *)tr,1 ); + }break ;default :if (tr->allocated_snapshot) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 195/367 phy/rockchip: inno-hdmi: use correct vco_div_5 macro on rk3328
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 644c06dfbd0da713f772abf0a8f8581ac78e6264 ]
inno_hdmi_phy_rk3328_clk_set_rate() is using the RK3228 macro when configuring vco_div_5 on RK3328.
Fix this by using correct vco_div_5 macro for RK3328.
--- drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +2 -2
@@ -790,8 +790,8 @@ static int inno_hdmi_phy_rk3328_clk_set_rate(struct clk_hw *hw, RK3328_PRE_PLL_POWER_DOWN);/* Configure pre-pll */ -inno_update_bits (inno,0xa0 ,RK3228_PCLK_VCO_DIV_5_MASK , -RK3228_PCLK_VCO_DIV_5 (cfg->vco_div_5_en)); +inno_update_bits (inno,0xa0 ,RK3328_PCLK_VCO_DIV_5_MASK , +RK3328_PCLK_VCO_DIV_5 (cfg->vco_div_5_en));inno_write (inno,0xa1 ,RK3328_PRE_PLL_PRE_DIV (cfg->prediv)); val =RK3328_SPREAD_SPECTRUM_MOD_DISABLE ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 196/367 phy/rockchip: inno-hdmi: round fractal pixclock in rk3328 recalc_rate
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yang <[email protected]>
[ Upstream commit d5ef343c1d62bc4c4c2c393af654a41cb34b449f ]
inno_hdmi_phy_rk3328_clk_recalc_rate() is returning a rate not found in the pre pll config table when the fractal divider is used. This can prevent proper power_on because a tmdsclock for the new rate is not found in the pre pll config table.
Fix this by saving and returning a rounded pixel rate that exist in the pre pll config table.
--- drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +5 -3
@@ -745,10 +745,12 @@ unsigned long inno_hdmi_phy_rk3328_clk_recalc_rate(struct clk_hw *hw,do_div (vco, (nd * (no_a ==1 ? no_b : no_a) * no_d *2 )); } - inno->pixclock = vco; -dev_dbg (inno->dev,"%s rate %lu\n" , __func__, inno->pixclock); + inno->pixclock =DIV_ROUND_CLOSEST ((unsigned long )vco,1000 ) *1000 ; -return vco; +dev_dbg (inno->dev,"%s rate %lu vco %llu\n" , + __func__, inno->pixclock, vco); + +return inno->pixclock; } static long inno_hdmi_phy_rk3328_clk_round_rate(struct clk_hw *hw,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 197/367 phy/rockchip: inno-hdmi: do not power on rk3328 post pll on reg write
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 19a1d46bd699940a496d3b0d4e142ef99834988c ]
inno_write is used to configure 0xaa reg, that also hold the POST_PLL_POWER_DOWN bit.
When POST_PLL_REFCLK_SEL_TMDS is configured the power down bit is not taken into consideration.
Fix this by keeping the power down bit until configuration is complete. Also reorder the reg write order for consistency.
--- drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +4 -2
@@ -1023,9 +1023,10 @@ inno_hdmi_phy_rk3328_power_on(struct inno_hdmi_phy *inno,inno_write (inno,0xac ,RK3328_POST_PLL_FB_DIV_7_0 (cfg->fbdiv));if (cfg->postdiv ==1 ) { -inno_write (inno,0xaa ,RK3328_POST_PLL_REFCLK_SEL_TMDS );inno_write (inno,0xab ,RK3328_POST_PLL_FB_DIV_8 (cfg->fbdiv) |RK3328_POST_PLL_PRE_DIV (cfg->prediv)); +inno_write (inno,0xaa ,RK3328_POST_PLL_REFCLK_SEL_TMDS | +RK3328_POST_PLL_POWER_DOWN ); }else { v = (cfg->postdiv /2 ) -1 ; v &=RK3328_POST_PLL_POST_DIV_MASK ;
@@ -1033,7 +1034,8 @@ inno_hdmi_phy_rk3328_power_on(struct inno_hdmi_phy *inno,inno_write (inno,0xab ,RK3328_POST_PLL_FB_DIV_8 (cfg->fbdiv) |RK3328_POST_PLL_PRE_DIV (cfg->prediv));inno_write (inno,0xaa ,RK3328_POST_PLL_POST_DIV_ENABLE | -RK3328_POST_PLL_REFCLK_SEL_TMDS ); +RK3328_POST_PLL_REFCLK_SEL_TMDS | +RK3328_POST_PLL_POWER_DOWN ); }for (v =0 ; v <14 ; v++)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 198/367 rpmsg: glink: Add check for kstrdup
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiasheng Jiang <[email protected]>
[ Upstream commit b5c9ee8296a3760760c7b5d2e305f91412adc795 ]
Add check for the return value of kstrdup() and return the error if it fails in order to avoid NULL pointer dereference.
--- drivers/rpmsg/qcom_glink_native.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/rpmsg/qcom_glink_native.c +4 -0
@@ -222,6 +222,10 @@ static struct glink_channel *qcom_glink_alloc_channel(struct qcom_glink *glink, channel->glink = glink; channel->name =kstrdup (name,GFP_KERNEL ); +if (!channel->name) { +kfree (channel); +return ERR_PTR (-ENOMEM ); + }init_completion (&channel->open_req);init_completion (&channel->open_ack);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 199/367 mtd: rawnand: fsmc: handle clk prepare error in fsmc_nand_resume()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yi Yang <[email protected]>
[ Upstream commit a5a88125d00612586e941ae13e7fcf36ba8f18a7 ]
In fsmc_nand_resume(), the return value of clk_prepare_enable() should be checked since it might fail.
--- drivers/mtd/nand/raw/fsmc_nand.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/fsmc_nand.c +6 -1
@@ -1181,9 +1181,14 @@ static int fsmc_nand_suspend(struct device *dev)static int fsmc_nand_resume (struct device *dev) {struct fsmc_nand_data *host =dev_get_drvdata (dev); +int ret;if (host) { -clk_prepare_enable (host->clk); + ret =clk_prepare_enable (host->clk); +if (ret) { +dev_err (dev,"failed to enable clk\n" ); +return ret; + }if (host->dev_timings)fsmc_nand_setup (host, host->dev_timings);nand_reset (&host->nand,0 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 200/367 um: Fix hostaudio build errors
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit db4bfcba7bb8d10f00bba2a3da6b9a9c2a1d7b71 ]
Use "select" to ensure that the required kconfig symbols are set as expected.
Drop HOSTAUDIO since it is now equivalent to UML_SOUND.
Set CONFIG_SOUND=m in ARCH=um defconfig files to maintain the status quo of the default configs.
Allow SOUND with UML regardless of HAS_IOMEM. Otherwise there is a kconfig warning for unmet dependencies. (This was not an issue when SOUND was defined in arch/um/drivers/Kconfig. I have done 50 randconfig builds and didn't find any issues.)
This fixes build errors when CONFIG_SOUND is not set:
ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_cleanup_module':
hostaudio_kern.c:(.exit.text+0xa): undefined reference to `unregister_sound_mixer'
ld: hostaudio_kern.c:(.exit.text+0x15): undefined reference to `unregister_sound_dsp'
ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_init_module':
hostaudio_kern.c:(.init.text+0x19): undefined reference to `register_sound_dsp'
ld: hostaudio_kern.c:(.init.text+0x31): undefined reference to `register_sound_mixer'
ld: hostaudio_kern.c:(.init.text+0x49): undefined reference to `unregister_sound_dsp'
and this kconfig warning:
WARNING: unmet direct dependencies detected for SOUND
--- arch/um/configs/i386_defconfig | 1 + arch/um/configs/x86_64_defconfig | 1 + arch/um/drivers/Kconfig | 16 +++------------- arch/um/drivers/Makefile | 2 +- sound/Kconfig | 2 +- 5 files changed, 7 insertions(+), 15 deletions(-)
arch/um/configs/i386_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_TTY_CHAN=y CONFIG_XTERM_CHAN=y CONFIG_CON_CHAN="pts" CONFIG_SSL_CHAN="pts" +CONFIG_SOUND=m CONFIG_UML_SOUND=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y
arch/um/configs/x86_64_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_TTY_CHAN=y CONFIG_XTERM_CHAN=y CONFIG_CON_CHAN="pts" CONFIG_SSL_CHAN="pts" +CONFIG_SOUND=m CONFIG_UML_SOUND=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y
arch/um/drivers/Kconfig +3 -13
@@ -104,24 +104,14 @@ config SSL_CHAN config UML_SOUND tristate "Sound support" + depends on SOUND + select SOUND_OSS_CORE help This option enables UML sound support. If enabled, it will pull in - soundcore and the UML hostaudio relay, which acts as a intermediary + the UML hostaudio relay, which acts as a intermediary between the host's dsp and mixer devices and the UML sound system. It is safe to say 'Y' here. -config SOUND - tristate - default UML_SOUND - -config SOUND_OSS_CORE - bool - default UML_SOUND - -config HOSTAUDIO - tristate - default UML_SOUND - endmenu menu "UML Network Devices"
arch/um/drivers/Makefile +1 -1
@@ -52,7 +52,7 @@ obj-$(CONFIG_UML_NET) += net.o obj-$(CONFIG_MCONSOLE) += mconsole.o obj-$(CONFIG_MMAPPER) += mmapper_kern.o obj-$(CONFIG_BLK_DEV_UBD) += ubd.o -obj-$(CONFIG_HOSTAUDIO) += hostaudio.o +obj-$(CONFIG_UML_SOUND) += hostaudio.o obj-$(CONFIG_NULL_CHAN) += null.o obj-$(CONFIG_PORT_CHAN) += port.o obj-$(CONFIG_PTY_CHAN) += pty.o
sound/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig SOUND tristate "Sound card support" - depends on HAS_IOMEM + depends on HAS_IOMEM || UML help If you have a sound card in your computer, i.e. if it can say more than an occasional beep, say Y.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 201/367 dmaengine: ste_dma40: Add missing IRQ check in d40_probe
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: ruanjinjie <[email protected]>
[ Upstream commit c05ce6907b3d6e148b70f0bb5eafd61dcef1ddc1 ]
Check for the return value of platform_get_irq(): if no interrupt is specified, it wouldn't make sense to call request_irq().
--- drivers/dma/ste_dma40.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/dma/ste_dma40.c +4 -0
@@ -3599,6 +3599,10 @@ static int __init d40_probe(struct platform_device *pdev)spin_lock_init (&base->lcla_pool.lock); base->irq =platform_get_irq (pdev,0 ); +if (base->irq <0 ) { + ret = base->irq; + goto destroy_cache; + } ret =request_irq (base->irq, d40_handle_interrupt,0 ,D40_NAME , base);if (ret) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 202/367 cpufreq: Fix the race condition while updating the transition_task of policy
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liao Chang <[email protected]>
[ Upstream commit 61bfbf7951ba561dcbdd5357702d3cbc2d447812 ]
The field 'transition_task' of policy structure is used to track the task which is performing the frequency transition. Using this field to print a warning once detect a case where the same task is calling _begin() again before completing the preivous frequency transition via the _end().
However, there is a potential race condition in _end() and _begin() APIs while updating the field 'transition_task' of policy, the scenario is depicted below:
Task A Task B
/* 1st freq transition */
Invoke _begin() {
...
...
}
/* 2nd freq transition */
Invoke _begin() {
... //waiting for A to
... //clear
... //transition_ongoing
... //in _end() for
... //the 1st transition
|
Change the frequency |
|
Invoke _end() { |
... |
... |
transition_ongoing = false; V
transition_ongoing = true;
transition_task = current;
transition_task = NULL;
... //A overwrites the task
... //performing the transition
... //result in error warning.
}To fix this race condition, the transition_lock of policy structure is now acquired before updating policy structure in _end() API. Which ensure that only one task can update the 'transition_task' field at a time.
--- drivers/cpufreq/cpufreq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/cpufreq/cpufreq.c +2 -0
@@ -441,8 +441,10 @@ void cpufreq_freq_transition_end(struct cpufreq_policy *policy,cpufreq_notify_post_transition (policy, freqs, transition_failed); +spin_lock (&policy->transition_lock); policy->transition_ongoing = false; policy->transition_task =NULL ; +spin_unlock (&policy->transition_lock);wake_up (&policy->transition_wait); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 203/367 virtio_ring: fix avail_wrap_counter in virtqueue_add_packed
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuan Yao <[email protected]>
[ Upstream commit 1acfe2c1225899eab5ab724c91b7e1eb2881b9ab ]
In current packed virtqueue implementation, the avail_wrap_counter won't flip, in the case when the driver supplies a descriptor chain with a length equals to the queue size; total_sg == vq->packed.vring.num.
Let’s assume the following situation:
vq->packed.vring.num=4vq->packed.next_avail_idx: 1vq->packed.avail_wrap_counter: 0
Then the driver adds a descriptor chain containing 4 descriptors.
We expect the following result with avail_wrap_counter flipped:vq->packed.next_avail_idx: 1 vq->packed.avail_wrap_counter: 1
But, the current implementation gives the following result:vq->packed.next_avail_idx: 1 vq->packed.avail_wrap_counter: 0
To reproduce the bug, you can set a packed queue size as small as possible, so that the driver is more likely to provide a descriptor chain with a length equal to the packed queue size. For example, in qemu run following commands:
sudo qemu-system-x86_64 \
-enable-kvm \
-nographic \
-kernel "path/to/kernel_image" \
-m 1G \
-drive file="path/to/rootfs",if=none,id=disk \
-device virtio-blk,drive=disk \
-drive file="path/to/disk_image",if=none,id=rwdisk \
-device virtio-blk,drive=rwdisk,packed=on,queue-size=4,\
indirect_desc=off \
-append "console=ttyS0 root=/dev/vda rw init=/bin/bash"
Inside the VM, create a directory and mount the rwdisk device on it. The rwdisk will hang and mount operation will not complete.
This commit fixes the wrap counter error by flipping the packed.avail_wrap_counter, when start of descriptor chain equals to the end of descriptor chain (head == i).
Message-Id: <[email protected]>
--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virtio/virtio_ring.c +1 -1
@@ -1180,7 +1180,7 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq, } } -if (i < head) +if (i <= head) vq->packed.avail_wrap_counter ^=1 ;/* We're using some buffers from the free list. */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 204/367 igmp: limit igmpv3_newpack() packet size to IP_MAX_MTU
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit c3b704d4a4a265660e665df51b129e8425216ed1 upstream.
This is a follow up of commit 915d975b2ffa ("net: deal with integer overflows in kmalloc_reserve()") based on David Laight feedback.
Back in 2010, I failed to realize malicious users could set dev->mtu to arbitrary values. This mtu has been since limited to 0x7fffffff but regardless of how big dev->mtu is, it makes no sense for igmpv3_newpack() to allocate more than IP_MAX_MTU and risk various skb fields overflows.
--- net/ipv4/igmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/igmp.c +2 -1
@@ -355,8 +355,9 @@ static struct sk_buff *igmpv3_newpack(ststruct flowi4 fl4;int hlen =LL_RESERVED_SPACE (dev);int tlen = dev->needed_tailroom; -unsigned int size = mtu; +unsigned int size; + size =min (mtu,IP_MAX_MTU );while (1 ) { skb =alloc_skb (size + hlen + tlen,GFP_ATOMIC | __GFP_NOWARN);
Greg Kroah-Hartman
maintainerPATCH 205/367 netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kyle Zeng <[email protected]>
commit 050d91c03b28ca479df13dfb02bcd2c60dd6a878 upstream.
The missing IP_SET_HASH_WITH_NET0 macro in ip_set_hash_netportnet can lead to the use of wrong CIDR_POS(c) for calculating array offsets, which can lead to integer underflow. As a result, it leads to slab out-of-bound access.
This patch adds back the IP_SET_HASH_WITH_NET0 macro to ip_set_hash_netportnet to address the issue.
--- net/netfilter/ipset/ip_set_hash_netportnet.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/ipset/ip_set_hash_netportnet.c +1 -0
@@ -35,6 +35,7 @@ MODULE_ALIAS("ip_set_hash:net,port,net")#define IP_SET_HASH_WITH_PROTO #define IP_SET_HASH_WITH_NETS #define IPSET_NET_COUNT 2 +#define IP_SET_HASH_WITH_NET0 /* IPv4 variant */
Greg Kroah-Hartman
maintainerPATCH 206/367 netfilter: xt_u32: validate user space input
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wander Lairson Costa <[email protected]>
commit 69c5d284f67089b4750d28ff6ac6f52ec224b330 upstream.
The xt_u32 module doesn't validate the fields in the xt_u32 structure. An attacker may take advantage of this to trigger an OOB read by setting the size fields with a value beyond the arrays boundaries.
Add a checkentry function to validate the structure.
This was originally reported by the ZDI project (ZDI-CAN-18408).
--- net/netfilter/xt_u32.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
net/netfilter/xt_u32.c +21 -0
@@ -96,11 +96,32 @@ static bool u32_mt(const struct sk_buffreturn ret ^ data->invert; } +static int u32_mt_checkentry (const struct xt_mtchk_param *par) +{ +const struct xt_u32 *data = par->matchinfo; +const struct xt_u32_test *ct; +unsigned int i; + +if (data->ntests >ARRAY_SIZE (data->tests)) +return -EINVAL ; + +for (i =0 ; i < data->ntests; ++i) { + ct = &data->tests[i]; + +if (ct->nnums >ARRAY_SIZE (ct->location) || + ct->nvalues >ARRAY_SIZE (ct->value)) +return -EINVAL ; + } + +return 0 ; +} +static struct xt_match xt_u32_mt_reg__read_mostly = { .name ="u32" , .revision =0 , .family =NFPROTO_UNSPEC , .match = u32_mt, + .checkentry = u32_mt_checkentry, .matchsize =sizeof (struct xt_u32 ), .me =THIS_MODULE , };
Greg Kroah-Hartman
maintainerPATCH 207/367 netfilter: xt_sctp: validate the flag_info count
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wander Lairson Costa <[email protected]>
commit e99476497687ef9e850748fe6d232264f30bc8f9 upstream.
sctp_mt_check doesn't validate the flag_count field. An attacker can take advantage of that to trigger a OOB read and leak memory information.
Add the field validation in the checkentry function.
--- net/netfilter/xt_sctp.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/xt_sctp.c +2 -0
@@ -150,6 +150,8 @@ static int sctp_mt_check(const struct xt {const struct xt_sctp_info *info = par->matchinfo; +if (info->flag_count >ARRAY_SIZE (info->flag_info)) +return -EINVAL ;if (info->flags & ~XT_SCTP_VALID_FLAGS )return -EINVAL ;if (info->invflags & ~XT_SCTP_VALID_FLAGS )
Greg Kroah-Hartman
maintainerPATCH 208/367 skbuff: skb_segment, Call zero copy functions before using skbuff frags
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mohamed Khalfella <[email protected]>
commit 2ea35288c83b3d501a88bc17f2df8f176b5cc96f upstream.
Commit bf5c25d60861 ("skbuff: in skb_segment, call zerocopy functions once per nskb") added the call to zero copy functions in skb_segment(). The change introduced a bug in skb_segment() because skb_orphan_frags() may possibly change the number of fragments or allocate new fragments altogether leaving nrfrags and frag to point to the old values. This can cause a panic with stacktrace like the one below.
[ 193.894380] BUG: kernel NULL pointer dereference, address: 00000000000000bc [ 193.895273] CPU: 13 PID: 18164 Comm: vh-net-17428 Kdump: loaded Tainted: G O 5.15.123+ #26 [ 193.903919] RIP: 0010:skb_segment+0xb0e/0x12f0 [ 194.021892] Call Trace: [ 194.027422] <TASK> [ 194.072861] tcp_gso_segment+0x107/0x540 [ 194.082031] inet_gso_segment+0x15c/0x3d0 [ 194.090783] skb_mac_gso_segment+0x9f/0x110 [ 194.095016] __skb_gso_segment+0xc1/0x190 [ 194.103131] netem_enqueue+0x290/0xb10 [sch_netem] [ 194.107071] dev_qdisc_enqueue+0x16/0x70 [ 194.110884] __dev_queue_xmit+0x63b/0xb30 [ 194.121670] bond_start_xmit+0x159/0x380 [bonding] [ 194.128506] dev_hard_start_xmit+0xc3/0x1e0 [ 194.131787] __dev_queue_xmit+0x8a0/0xb30 [ 194.138225] macvlan_start_xmit+0x4f/0x100 [macvlan] [ 194.141477] dev_hard_start_xmit+0xc3/0x1e0 [ 194.144622] sch_direct_xmit+0xe3/0x280 [ 194.147748] __dev_queue_xmit+0x54a/0xb30 [ 194.154131] tap_get_user+0x2a8/0x9c0 [tap] [ 194.157358] tap_sendmsg+0x52/0x8e0 [tap] [ 194.167049] handle_tx_zerocopy+0x14e/0x4c0 [vhost_net] [ 194.173631] handle_tx+0xcd/0xe0 [vhost_net] [ 194.176959] vhost_worker+0x76/0xb0 [vhost] [ 194.183667] kthread+0x118/0x140 [ 194.190358] ret_from_fork+0x1f/0x30 [ 194.193670] </TASK>
In this case calling skb_orphan_frags() updated nr_frags leaving nrfrags local variable in skb_segment() stale. This resulted in the code hitting i >= nrfrags prematurely and trying to move to next frag_skb using list_skb pointer, which was NULL, and caused kernel panic. Move the call to zero copy functions before using frags and nr_frags.
--- net/core/skbuff.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-)
net/core/skbuff.c +20 -14
@@ -3686,21 +3686,20 @@ struct sk_buff *skb_segment(struct sk_bustruct sk_buff *segs =NULL ;struct sk_buff *tail =NULL ;struct sk_buff *list_skb =skb_shinfo (head_skb)->frag_list; -skb_frag_t *frag =skb_shinfo (head_skb)->frags;unsigned int mss =skb_shinfo (head_skb)->gso_size;unsigned int doffset = head_skb->data -skb_mac_header (head_skb); -struct sk_buff *frag_skb = head_skb;unsigned int offset = doffset;unsigned int tnl_hlen =skb_tnl_header_len (head_skb);unsigned int partial_segs =0 ;unsigned int headroom;unsigned int len = head_skb->len; +struct sk_buff *frag_skb; +skb_frag_t *frag;__be16 proto;bool csum, sg; -int nfrags =skb_shinfo (head_skb)->nr_frags;int err = -ENOMEM ;int i =0 ; -int pos; +int nfrags, pos;int dummy; if ((skb_shinfo(head_skb)->gso_type & SKB_GSO_DODGY) &&
@@ -3778,6 +3777,13 @@ normal: headroom =skb_headroom (head_skb); pos =skb_headlen (head_skb); +if (skb_orphan_frags (head_skb,GFP_ATOMIC )) +return ERR_PTR (-ENOMEM ); + + nfrags =skb_shinfo (head_skb)->nr_frags; + frag =skb_shinfo (head_skb)->frags; + frag_skb = head_skb; + do { struct sk_buff *nskb; skb_frag_t *nskb_frag;
@@ -3802,6 +3808,10 @@ normal: (skb_headlen(list_skb) == len || sg)) {BUG_ON (skb_headlen (list_skb) > len); + nskb =skb_clone (list_skb,GFP_ATOMIC ); +if (unlikely (!nskb)) + goto err; + i =0 ; nfrags =skb_shinfo (list_skb)->nr_frags; frag =skb_shinfo (list_skb)->frags;
@@ -3820,12 +3830,8 @@ normal: frag++; } - nskb =skb_clone (list_skb,GFP_ATOMIC ); list_skb = list_skb->next; -if (unlikely (!nskb)) - goto err; -if (unlikely (pskb_trim (nskb, len))) {kfree_skb (nskb); goto err;
@@ -3890,12 +3896,16 @@ normal:skb_shinfo (nskb)->tx_flags |=skb_shinfo (head_skb)->tx_flags &SKBTX_SHARED_FRAG ; -if (skb_orphan_frags (frag_skb,GFP_ATOMIC ) || -skb_zerocopy_clone (nskb, frag_skb,GFP_ATOMIC )) +if (skb_zerocopy_clone (nskb, frag_skb,GFP_ATOMIC )) goto err;while (pos < offset + len) {if (i >= nfrags) { +if (skb_orphan_frags (list_skb,GFP_ATOMIC ) || +skb_zerocopy_clone (nskb, list_skb, +GFP_ATOMIC )) + goto err; + i =0 ; nfrags =skb_shinfo (list_skb)->nr_frags; frag =skb_shinfo (list_skb)->frags;
@@ -3909,10 +3919,6 @@ normal: i--; frag--; } -if (skb_orphan_frags (frag_skb,GFP_ATOMIC ) || -skb_zerocopy_clone (nskb, frag_skb, -GFP_ATOMIC )) - goto err; list_skb = list_skb->next; }
Greg Kroah-Hartman
maintainerPATCH 209/367 igb: set max size RX buffer when store bad packet is enabled
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Radoslaw Tyl <[email protected]>
commit bb5ed01cd2428cd25b1c88a3a9cba87055eb289f upstream.
Increase the RX buffer size to 3K when the SBP bit is on. The size of the RX buffer determines the number of pages allocated which may not be sufficient for receive frames larger than the set MTU size.
--- drivers/net/ethernet/intel/igb/igb_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +7 -4
@@ -4552,6 +4552,10 @@ void igb_configure_rx_ring(struct igb_adstatic void igb_set_rx_buffer_len (struct igb_adapter *adapter,struct igb_ring *rx_ring) { +#if (PAGE_SIZE <8192 ) +struct e1000_hw *hw = &adapter->hw; +#endif +/* set build_skb and buffer size flags */ clear_ring_build_skb_enabled (rx_ring);clear_ring_uses_large_buffer (rx_ring);
@@ -4562,10 +4566,9 @@ static void igb_set_rx_buffer_len(structset_ring_build_skb_enabled (rx_ring);#if (PAGE_SIZE <8192 ) -if (adapter->max_frame_size <=IGB_MAX_FRAME_BUILD_SKB ) -return ; - -set_ring_uses_large_buffer (rx_ring); +if (adapter->max_frame_size >IGB_MAX_FRAME_BUILD_SKB || +rd32 (E1000_RCTL ) &E1000_RCTL_SBP ) +set_ring_uses_large_buffer (rx_ring);#endif }
Greg Kroah-Hartman
maintainerPATCH 210/367 PM / devfreq: Fix leak in devfreq_dev_release()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
commit 5693d077595de721f9ddbf9d37f40e5409707dfe upstream.
srcu_init_notifier_head() allocates resources that need to be released with a srcu_cleanup_notifier_head() call.
Reported by kmemleak.
--- drivers/devfreq/devfreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/devfreq/devfreq.c +1 -0
@@ -595,6 +595,7 @@ static void devfreq_dev_release(struct d devfreq->profile->exit (devfreq->dev.parent);mutex_destroy (&devfreq->lock); +srcu_cleanup_notifier_head (&devfreq->transition_notifier_list);kfree (devfreq); }
Greg Kroah-Hartman
maintainerPATCH 211/367 ALSA: pcm: Fix missing fixup call in compat hw_refine ioctl
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 358040e3807754944dbddf948a23c6d914297ed7 upstream.
The update of rate_num/den and msbits were factored out to fixup_unreferenced_params() function to be called explicitly after the hw_refine or hw_params procedure. It's called from snd_pcm_hw_refine_user(), but it's forgotten in the PCM compat ioctl. This ended up with the incomplete rate_num/den and msbits parameters when 32bit compat ioctl is used.
This patch adds the missing call in snd_pcm_ioctl_hw_params_compat().
--- sound/core/pcm_compat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/core/pcm_compat.c +6 -2
@@ -315,10 +315,14 @@ static int snd_pcm_ioctl_hw_params_compa goto error; } -if (refine) +if (refine) { err =snd_pcm_hw_refine (substream, data); -else +if (err <0 ) + goto error; + err =fixup_unreferenced_params (substream, data); + }else { err =snd_pcm_hw_params (substream, data); + }if (err <0 ) goto error; if (copy_to_user(data32, data, sizeof(*data32)) ||
Greg Kroah-Hartman
maintainerPATCH 212/367 ipmi_si: fix a memleak in try_smi_init()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yi Yang <[email protected]>
commit 6cf1a126de2992b4efe1c3c4d398f8de4aed6e3f upstream.
Kmemleak reported the following leak info in try_smi_init():
unreferenced object 0xffff00018ecf9400 (size 1024):
comm "modprobe", pid 2707763, jiffies 4300851415 (age 773.308s) backtrace:
[<000000004ca5b312>] __kmalloc+0x4b8/0x7b0
[<00000000953b1072>] try_smi_init+0x148/0x5dc [ipmi_si]
[<000000006460d325>] 0xffff800081b10148
[<0000000039206ea5>] do_one_initcall+0x64/0x2a4
[<00000000601399ce>] do_init_module+0x50/0x300
[<000000003c12ba3c>] load_module+0x7a8/0x9e0
[<00000000c246fffe>] __se_sys_init_module+0x104/0x180
[<00000000eea99093>] __arm64_sys_init_module+0x24/0x30
[<0000000021b1ef87>] el0_svc_common.constprop.0+0x94/0x250
[<0000000070f4f8b7>] do_el0_svc+0x48/0xe0
[<000000005a05337f>] el0_svc+0x24/0x3c
[<000000005eb248d6>] el0_sync_handler+0x160/0x164
[<0000000030a59039>] el0_sync+0x160/0x180The problem was that when an error occurred before handlers registration and after allocating new_smi->si_sm, the variable wouldn't be freed in the error handling afterwards since shutdown_smi() hadn't been registered yet. Fix it by adding a kfree() in the error handling path in try_smi_init().
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_si_intf.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/char/ipmi/ipmi_si_intf.c +5 -0
@@ -2086,6 +2086,11 @@ static int try_smi_init(struct smi_info new_smi->io.io_cleanup =NULL ; } +if (rv && new_smi->si_sm) { +kfree (new_smi->si_sm); + new_smi->si_sm =NULL ; + } +return rv; }
Greg Kroah-Hartman
maintainerPATCH 213/367 ARM: OMAP2+: Fix -Warray-bounds warning in _pwrdm_state_switch()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit 847fb80cc01a54bc827b02547bb8743bdb59ddab upstream.
If function pwrdm_read_prev_pwrst() returns -EINVAL, we will end up accessing array pwrdm->state_counter through negative index -22. This is wrong and the compiler is legitimately warning us about this potential problem.
Fix this by sanity checking the value stored in variable _prev_ before accessing array pwrdm->state_counter.
Address the following -Warray-bounds warning:arch/arm/mach-omap2/powerdomain.c:178:45: warning: array subscript -22 is below array bounds of 'unsigned int[4]' [-Warray-bounds]
Message-ID: <ZIFVGwImU3kpaGeH@work>
--- arch/arm/mach-omap2/powerdomain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/powerdomain.c +1 -1
@@ -174,7 +174,7 @@ static int _pwrdm_state_switch(struct pobreak ;case PWRDM_STATE_PREV : prev =pwrdm_read_prev_pwrst (pwrdm); -if (pwrdm->state != prev) +if (prev >=0 && pwrdm->state != prev) pwrdm->state_counter[prev]++;if (prev ==PWRDM_POWER_RET )_update_logic_membank_counters (pwrdm);
Greg Kroah-Hartman
maintainerPATCH 214/367 backlight/gpio_backlight: Compare against struct fb_info.device
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit 7b91d017f77c1bda56f27c2f4bbb70de7c6eca08 upstream.
Struct gpio_backlight_platform_data refers to a platform device within the Linux device hierarchy. The test in gpio_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.
Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)
--- drivers/video/backlight/gpio_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/backlight/gpio_backlight.c +1 -1
@@ -46,7 +46,7 @@ static int gpio_backlight_check_fb(struc {struct gpio_backlight *gbl =bl_get_data (bl); -return gbl->fbdev ==NULL || gbl->fbdev == info->dev; +return gbl->fbdev ==NULL || gbl->fbdev == info->device; }static const struct backlight_ops gpio_backlight_ops = {
Greg Kroah-Hartman
maintainerPATCH 215/367 backlight/bd6107: Compare against struct fb_info.device
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit 992bdddaabfba19bdc77c1c7a4977b2aa41ec891 upstream.
Struct bd6107_platform_data refers to a platform device within the Linux device hierarchy. The test in bd6107_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.
Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)
--- drivers/video/backlight/bd6107.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/backlight/bd6107.c +1 -1
@@ -107,7 +107,7 @@ static int bd6107_backlight_check_fb(str {struct bd6107 *bd =bl_get_data (backlight); -return bd->pdata->fbdev ==NULL || bd->pdata->fbdev == info->dev; +return bd->pdata->fbdev ==NULL || bd->pdata->fbdev == info->device; }static const struct backlight_ops bd6107_backlight_ops = {
Greg Kroah-Hartman
maintainerPATCH 216/367 backlight/lv5207lp: Compare against struct fb_info.device
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit 1ca8819320fd84e7d95b04e7668efc5f9fe9fa5c upstream.
Struct lv5207lp_platform_data refers to a platform device within the Linux device hierarchy. The test in lv5207lp_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device.
Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional.
v2:
* move renames into separate patch (Javier, Sam, Michael)
--- drivers/video/backlight/lv5207lp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/backlight/lv5207lp.c +1 -1
@@ -72,7 +72,7 @@ static int lv5207lp_backlight_check_fb(s {struct lv5207lp *lv =bl_get_data (backlight); -return lv->pdata->fbdev ==NULL || lv->pdata->fbdev == info->dev; +return lv->pdata->fbdev ==NULL || lv->pdata->fbdev == info->device; }static const struct backlight_ops lv5207lp_backlight_ops = {
Greg Kroah-Hartman
maintainerPATCH 217/367 xtensa: PMU: fix base address for the newer hardware
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
commit 687eb3c42f4ad81e7c947c50e2d865f692064291 upstream.
With introduction of ERI access control in RG.0 base address of the PMU unit registers has changed. Add support for the new PMU configuration.
--- arch/xtensa/include/asm/core.h | 9 +++++++++ arch/xtensa/kernel/perf_event.c | 17 +++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-)
arch/xtensa/include/asm/core.h +9 -0
@@ -18,4 +18,13 @@#define XCHAL_SPANNING_WAY 0#endif +#ifndef XCHAL_HW_MIN_VERSION +#if defined(XCHAL_HW_MIN_VERSION_MAJOR ) && defined(XCHAL_HW_MIN_VERSION_MINOR ) +#define XCHAL_HW_MIN_VERSION (XCHAL_HW_MIN_VERSION_MAJOR * 100 + \ + XCHAL_HW_MIN_VERSION_MINOR) +#else +#define XCHAL_HW_MIN_VERSION 0 +#endif +#endif +#endif
arch/xtensa/kernel/perf_event.c +13 -4
@@ -13,17 +13,26 @@#include <linux/perf_event.h> #include <linux/platform_device.h> +#include <asm/core.h> #include <asm/processor.h> #include <asm/stacktrace.h> +#define XTENSA_HWVERSION_RG_2015_0 260000 + +#if XCHAL_HW_MIN_VERSION >=XTENSA_HWVERSION_RG_2015_0 +#define XTENSA_PMU_ERI_BASE 0x00101000 +#else +#define XTENSA_PMU_ERI_BASE 0x00001000 +#endif +/* Global control/status for all perf counters */ -#define XTENSA_PMU_PMG 0x1000 +#define XTENSA_PMU_PMG XTENSA_PMU_ERI_BASE/* Perf counter values */ -#define XTENSA_PMU_PM (i) (0x1080 + (i) * 4) +#define XTENSA_PMU_PM (i) (XTENSA_PMU_ERI_BASE + 0x80 + (i) * 4)/* Perf counter control registers */ -#define XTENSA_PMU_PMCTRL (i) (0x1100 + (i) * 4) +#define XTENSA_PMU_PMCTRL (i) (XTENSA_PMU_ERI_BASE + 0x100 + (i) * 4)/* Perf counter status registers */ -#define XTENSA_PMU_PMSTAT (i) (0x1180 + (i) * 4) +#define XTENSA_PMU_PMSTAT (i) (XTENSA_PMU_ERI_BASE + 0x180 + (i) * 4)#define XTENSA_PMU_PMG_PMEN 0x1
Greg Kroah-Hartman
maintainerPATCH 218/367 media: dvb: symbol fixup for dvb_attach()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 86495af1171e1feec79faa9b64c05c89f46e41d1 upstream.
In commit 9011e49d54dc ("modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules") the use of symbol_get is properly restricted to GPL-only marked symbols. This interacts oddly with the DVB logic which only uses dvb_attach() to load the dvb driver which then uses symbol_get().
Fix this up by properly marking all of the dvb_attach attach symbols as EXPORT_SYMBOL_GPL().
--- drivers/media/dvb-frontends/ascot2e.c | 2 +- drivers/media/dvb-frontends/atbm8830.c | 2 +- drivers/media/dvb-frontends/au8522_dig.c | 2 +- drivers/media/dvb-frontends/bcm3510.c | 2 +- drivers/media/dvb-frontends/cx22700.c | 2 +- drivers/media/dvb-frontends/cx22702.c | 2 +- drivers/media/dvb-frontends/cx24110.c | 2 +- drivers/media/dvb-frontends/cx24113.c | 2 +- drivers/media/dvb-frontends/cx24116.c | 2 +- drivers/media/dvb-frontends/cx24120.c | 2 +- drivers/media/dvb-frontends/cx24123.c | 2 +- drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- drivers/media/dvb-frontends/cxd2841er.c | 4 ++-- drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +- drivers/media/dvb-frontends/dib0070.c | 2 +- drivers/media/dvb-frontends/dib0090.c | 4 ++-- drivers/media/dvb-frontends/dib3000mb.c | 2 +- drivers/media/dvb-frontends/dib3000mc.c | 2 +- drivers/media/dvb-frontends/dib7000m.c | 2 +- drivers/media/dvb-frontends/dib7000p.c | 2 +- drivers/media/dvb-frontends/dib8000.c | 2 +- drivers/media/dvb-frontends/dib9000.c | 2 +- drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- drivers/media/dvb-frontends/drxd_hard.c | 2 +- drivers/media/dvb-frontends/drxk_hard.c | 2 +- drivers/media/dvb-frontends/ds3000.c | 2 +- drivers/media/dvb-frontends/dvb-pll.c | 2 +- drivers/media/dvb-frontends/ec100.c | 2 +- drivers/media/dvb-frontends/helene.c | 4 ++-- drivers/media/dvb-frontends/horus3a.c | 2 +- drivers/media/dvb-frontends/isl6405.c | 2 +- drivers/media/dvb-frontends/isl6421.c | 2 +- drivers/media/dvb-frontends/isl6423.c | 2 +- drivers/media/dvb-frontends/itd1000.c | 2 +- drivers/media/dvb-frontends/ix2505v.c | 2 +- drivers/media/dvb-frontends/l64781.c | 2 +- drivers/media/dvb-frontends/lg2160.c | 2 +- drivers/media/dvb-frontends/lgdt3305.c | 2 +- drivers/media/dvb-frontends/lgdt3306a.c | 2 +- drivers/media/dvb-frontends/lgdt330x.c | 2 +- drivers/media/dvb-frontends/lgs8gxx.c | 2 +- drivers/media/dvb-frontends/lnbh25.c | 2 +- drivers/media/dvb-frontends/lnbp21.c | 4 ++-- drivers/media/dvb-frontends/lnbp22.c | 2 +- drivers/media/dvb-frontends/m88ds3103.c | 2 +- drivers/media/dvb-frontends/m88rs2000.c | 2 +- drivers/media/dvb-frontends/mb86a16.c | 2 +- drivers/media/dvb-frontends/mb86a20s.c | 2 +- drivers/media/dvb-frontends/mt312.c | 2 +- drivers/media/dvb-frontends/mt352.c | 2 +- drivers/media/dvb-frontends/nxt200x.c | 2 +- drivers/media/dvb-frontends/nxt6000.c | 2 +- drivers/media/dvb-frontends/or51132.c | 2 +- drivers/media/dvb-frontends/or51211.c | 2 +- drivers/media/dvb-frontends/s5h1409.c | 2 +- drivers/media/dvb-frontends/s5h1411.c | 2 +- drivers/media/dvb-frontends/s5h1420.c | 2 +- drivers/media/dvb-frontends/s5h1432.c | 2 +- drivers/media/dvb-frontends/s921.c | 2 +- drivers/media/dvb-frontends/si21xx.c | 2 +- drivers/media/dvb-frontends/sp887x.c | 2 +- drivers/media/dvb-frontends/stb0899_drv.c | 2 +- drivers/media/dvb-frontends/stb6000.c | 2 +- drivers/media/dvb-frontends/stb6100.c | 2 +- drivers/media/dvb-frontends/stv0288.c | 2 +- drivers/media/dvb-frontends/stv0297.c | 2 +- drivers/media/dvb-frontends/stv0299.c | 2 +- drivers/media/dvb-frontends/stv0367.c | 6 +++--- drivers/media/dvb-frontends/stv0900_core.c | 2 +- drivers/media/dvb-frontends/stv090x.c | 2 +- drivers/media/dvb-frontends/stv6110.c | 2 +- drivers/media/dvb-frontends/stv6110x.c | 2 +- drivers/media/dvb-frontends/tda10021.c | 2 +- drivers/media/dvb-frontends/tda10023.c | 2 +- drivers/media/dvb-frontends/tda10048.c | 2 +- drivers/media/dvb-frontends/tda1004x.c | 4 ++-- drivers/media/dvb-frontends/tda10086.c | 2 +- drivers/media/dvb-frontends/tda665x.c | 2 +- drivers/media/dvb-frontends/tda8083.c | 2 +- drivers/media/dvb-frontends/tda8261.c | 2 +- drivers/media/dvb-frontends/tda826x.c | 2 +- drivers/media/dvb-frontends/ts2020.c | 2 +- drivers/media/dvb-frontends/tua6100.c | 2 +- drivers/media/dvb-frontends/ves1820.c | 2 +- drivers/media/dvb-frontends/ves1x93.c | 2 +- drivers/media/dvb-frontends/zl10036.c | 2 +- drivers/media/dvb-frontends/zl10039.c | 2 +- drivers/media/dvb-frontends/zl10353.c | 2 +- drivers/media/pci/bt8xx/dst.c | 2 +- drivers/media/pci/bt8xx/dst_ca.c | 2 +- drivers/media/tuners/fc0011.c | 2 +- drivers/media/tuners/fc0012.c | 2 +- drivers/media/tuners/fc0013.c | 2 +- drivers/media/tuners/max2165.c | 2 +- drivers/media/tuners/mc44s803.c | 2 +- drivers/media/tuners/mt2060.c | 2 +- drivers/media/tuners/mt2131.c | 2 +- drivers/media/tuners/mt2266.c | 2 +- drivers/media/tuners/mxl5005s.c | 2 +- drivers/media/tuners/qt1010.c | 2 +- drivers/media/tuners/tda18218.c | 2 +- drivers/media/tuners/xc4000.c | 2 +- drivers/media/tuners/xc5000.c | 2 +- 103 files changed, 110 insertions(+), 110 deletions(-)
drivers/media/dvb-frontends/ascot2e.c +1 -1
@@ -533,7 +533,7 @@ struct dvb_frontend *ascot2e_attach(stru priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (ascot2e_attach); +EXPORT_SYMBOL_GPL (ascot2e_attach);MODULE_DESCRIPTION ("Sony ASCOT2E terr/cab tuner driver" );MODULE_AUTHOR ("[email protected]" );
drivers/media/dvb-frontends/atbm8830.c +1 -1
@@ -489,7 +489,7 @@ error_out:return NULL ; } -EXPORT_SYMBOL (atbm8830_attach); +EXPORT_SYMBOL_GPL (atbm8830_attach);MODULE_DESCRIPTION ("AltoBeam ATBM8830/8831 GB20600 demodulator driver" );MODULE_AUTHOR ("David T. L. Wong <[email protected]>" );
drivers/media/dvb-frontends/au8522_dig.c +1 -1
@@ -879,7 +879,7 @@ error:au8522_release_state (state);return NULL ; } -EXPORT_SYMBOL (au8522_attach); +EXPORT_SYMBOL_GPL (au8522_attach);static const struct dvb_frontend_ops au8522_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/bcm3510.c +1 -1
@@ -835,7 +835,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (bcm3510_attach); +EXPORT_SYMBOL_GPL (bcm3510_attach);static const struct dvb_frontend_ops bcm3510_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/cx22700.c +1 -1
@@ -432,4 +432,4 @@ MODULE_DESCRIPTION("Conexant CX22700 DVBMODULE_AUTHOR ("Holger Waechtler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (cx22700_attach); +EXPORT_SYMBOL_GPL (cx22700_attach);
drivers/media/dvb-frontends/cx22702.c +1 -1
@@ -604,7 +604,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (cx22702_attach); +EXPORT_SYMBOL_GPL (cx22702_attach);static const struct dvb_frontend_ops cx22702_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/cx24110.c +1 -1
@@ -653,4 +653,4 @@ MODULE_DESCRIPTION("Conexant CX24110 DVBMODULE_AUTHOR ("Peter Hettkamp" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (cx24110_attach); +EXPORT_SYMBOL_GPL (cx24110_attach);
drivers/media/dvb-frontends/cx24113.c +1 -1
@@ -590,7 +590,7 @@ error:return NULL ; } -EXPORT_SYMBOL (cx24113_attach); +EXPORT_SYMBOL_GPL (cx24113_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Activates frontend debugging (default:0)" );
drivers/media/dvb-frontends/cx24116.c +1 -1
@@ -1133,7 +1133,7 @@ struct dvb_frontend *cx24116_attach(cons state->frontend.demodulator_priv = state;return &state->frontend; } -EXPORT_SYMBOL (cx24116_attach); +EXPORT_SYMBOL_GPL (cx24116_attach);/* * Initialise or wake up device
drivers/media/dvb-frontends/cx24120.c +1 -1
@@ -305,7 +305,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (cx24120_attach); +EXPORT_SYMBOL_GPL (cx24120_attach);static int cx24120_test_rom (struct cx24120_state *state) {
drivers/media/dvb-frontends/cx24123.c +1 -1
@@ -1096,7 +1096,7 @@ error:return NULL ; } -EXPORT_SYMBOL (cx24123_attach); +EXPORT_SYMBOL_GPL (cx24123_attach);static const struct dvb_frontend_ops cx24123_ops = { .delsys = {SYS_DVBS },
drivers/media/dvb-frontends/cxd2820r_core.c +1 -1
@@ -536,7 +536,7 @@ struct dvb_frontend *cxd2820r_attach(conreturn pdata.get_dvb_frontend (client); } -EXPORT_SYMBOL (cxd2820r_attach); +EXPORT_SYMBOL_GPL (cxd2820r_attach);static struct dvb_frontend *cxd2820r_get_dvb_frontend (struct i2c_client *client) {
drivers/media/dvb-frontends/cxd2841er.c +2 -2
@@ -3920,14 +3920,14 @@ struct dvb_frontend *cxd2841er_attach_s( {return cxd2841er_attach (cfg, i2c,SYS_DVBS ); } -EXPORT_SYMBOL (cxd2841er_attach_s); +EXPORT_SYMBOL_GPL (cxd2841er_attach_s);struct dvb_frontend *cxd2841er_attach_t_c (struct cxd2841er_config *cfg,struct i2c_adapter *i2c) {return cxd2841er_attach (cfg, i2c,0 ); } -EXPORT_SYMBOL (cxd2841er_attach_t_c); +EXPORT_SYMBOL_GPL (cxd2841er_attach_t_c);static const struct dvb_frontend_ops cxd2841er_dvbs_s2_ops = { .delsys = {SYS_DVBS ,SYS_DVBS2 },
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c +1 -1
@@ -1950,7 +1950,7 @@ struct dvb_frontend *cxd2880_attach(strureturn fe; } -EXPORT_SYMBOL (cxd2880_attach); +EXPORT_SYMBOL_GPL (cxd2880_attach);MODULE_DESCRIPTION ("Sony CXD2880 DVB-T2/T tuner + demod driver" );MODULE_AUTHOR ("Sony Semiconductor Solutions Corporation" );
drivers/media/dvb-frontends/dib0070.c +1 -1
@@ -755,7 +755,7 @@ free_mem: fe->tuner_priv =NULL ;return NULL ; } -EXPORT_SYMBOL (dib0070_attach); +EXPORT_SYMBOL_GPL (dib0070_attach);MODULE_AUTHOR ("Patrick Boettcher <[email protected]>" );MODULE_DESCRIPTION ("Driver for the DiBcom 0070 base-band RF Tuner" );
drivers/media/dvb-frontends/dib0090.c +2 -2
@@ -2631,7 +2631,7 @@ struct dvb_frontend *dib0090_register(streturn NULL ; } -EXPORT_SYMBOL (dib0090_register); +EXPORT_SYMBOL_GPL (dib0090_register);struct dvb_frontend *dib0090_fw_register (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct dib0090_config *config) {
@@ -2657,7 +2657,7 @@ free_mem: fe->tuner_priv =NULL ;return NULL ; } -EXPORT_SYMBOL (dib0090_fw_register); +EXPORT_SYMBOL_GPL (dib0090_fw_register);MODULE_AUTHOR ("Patrick Boettcher <[email protected]>" );MODULE_AUTHOR ("Olivier Grenie <[email protected]>" );
drivers/media/dvb-frontends/dib3000mb.c +1 -1
@@ -815,4 +815,4 @@ MODULE_AUTHOR(DRIVER_AUTHOR);MODULE_DESCRIPTION (DRIVER_DESC );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (dib3000mb_attach); +EXPORT_SYMBOL_GPL (dib3000mb_attach);
drivers/media/dvb-frontends/dib3000mc.c +1 -1
@@ -935,7 +935,7 @@ error:kfree (st);return NULL ; } -EXPORT_SYMBOL (dib3000mc_attach); +EXPORT_SYMBOL_GPL (dib3000mc_attach);static const struct dvb_frontend_ops dib3000mc_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/dib7000m.c +1 -1
@@ -1434,7 +1434,7 @@ error:kfree (st);return NULL ; } -EXPORT_SYMBOL (dib7000m_attach); +EXPORT_SYMBOL_GPL (dib7000m_attach);static const struct dvb_frontend_ops dib7000m_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/dib7000p.c +1 -1
@@ -2822,7 +2822,7 @@ void *dib7000p_attach(struct dib7000p_opreturn ops; } -EXPORT_SYMBOL (dib7000p_attach); +EXPORT_SYMBOL_GPL (dib7000p_attach);static const struct dvb_frontend_ops dib7000p_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/dib8000.c +1 -1
@@ -4527,7 +4527,7 @@ void *dib8000_attach(struct dib8000_opsreturn ops; } -EXPORT_SYMBOL (dib8000_attach); +EXPORT_SYMBOL_GPL (dib8000_attach);MODULE_AUTHOR ("Olivier Grenie <[email protected], Patrick Boettcher <[email protected]>" );MODULE_DESCRIPTION ("Driver for the DiBcom 8000 ISDB-T demodulator" );
drivers/media/dvb-frontends/dib9000.c +1 -1
@@ -2546,7 +2546,7 @@ error:kfree (st);return NULL ; } -EXPORT_SYMBOL (dib9000_attach); +EXPORT_SYMBOL_GPL (dib9000_attach);static const struct dvb_frontend_ops dib9000_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/drx39xyj/drxj.c +1 -1
@@ -12366,7 +12366,7 @@ error:return NULL ; } -EXPORT_SYMBOL (drx39xxj_attach); +EXPORT_SYMBOL_GPL (drx39xxj_attach);static const struct dvb_frontend_ops drx39xxj_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/drxd_hard.c +1 -1
@@ -2948,7 +2948,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (drxd_attach); +EXPORT_SYMBOL_GPL (drxd_attach);MODULE_DESCRIPTION ("DRXD driver" );MODULE_AUTHOR ("Micronas" );
drivers/media/dvb-frontends/drxk_hard.c +1 -1
@@ -6857,7 +6857,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (drxk_attach); +EXPORT_SYMBOL_GPL (drxk_attach);MODULE_DESCRIPTION ("DRX-K driver" );MODULE_AUTHOR ("Ralph Metzler" );
drivers/media/dvb-frontends/ds3000.c +1 -1
@@ -859,7 +859,7 @@ struct dvb_frontend *ds3000_attach(constds3000_set_voltage (&state->frontend,SEC_VOLTAGE_OFF );return &state->frontend; } -EXPORT_SYMBOL (ds3000_attach); +EXPORT_SYMBOL_GPL (ds3000_attach);static int ds3000_set_carrier_offset (struct dvb_frontend *fe,s32 carrier_offset_khz)
drivers/media/dvb-frontends/dvb-pll.c +1 -1
@@ -866,7 +866,7 @@ out:return NULL ; } -EXPORT_SYMBOL (dvb_pll_attach); +EXPORT_SYMBOL_GPL (dvb_pll_attach); static int
drivers/media/dvb-frontends/ec100.c +1 -1
@@ -299,7 +299,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (ec100_attach); +EXPORT_SYMBOL_GPL (ec100_attach);static const struct dvb_frontend_ops ec100_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/helene.c +2 -2
@@ -1025,7 +1025,7 @@ struct dvb_frontend *helene_attach_s(str priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (helene_attach_s); +EXPORT_SYMBOL_GPL (helene_attach_s); struct dvb_frontend *helene_attach(struct dvb_frontend *fe, const struct helene_config *config,
@@ -1061,7 +1061,7 @@ struct dvb_frontend *helene_attach(struc priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (helene_attach); +EXPORT_SYMBOL_GPL (helene_attach);static int helene_probe (struct i2c_client *client,const struct i2c_device_id *id)
drivers/media/dvb-frontends/horus3a.c +1 -1
@@ -395,7 +395,7 @@ struct dvb_frontend *horus3a_attach(stru priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (horus3a_attach); +EXPORT_SYMBOL_GPL (horus3a_attach);MODULE_DESCRIPTION ("Sony HORUS3A satellite tuner driver" );MODULE_AUTHOR ("Sergey Kozlov <[email protected]>" );
drivers/media/dvb-frontends/isl6405.c +1 -1
@@ -141,7 +141,7 @@ struct dvb_frontend *isl6405_attach(strureturn fe; } -EXPORT_SYMBOL (isl6405_attach); +EXPORT_SYMBOL_GPL (isl6405_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic isl6405" );MODULE_AUTHOR ("Hartmut Hackmann & Oliver Endriss" );
drivers/media/dvb-frontends/isl6421.c +1 -1
@@ -213,7 +213,7 @@ struct dvb_frontend *isl6421_attach(strureturn fe; } -EXPORT_SYMBOL (isl6421_attach); +EXPORT_SYMBOL_GPL (isl6421_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic isl6421" );MODULE_AUTHOR ("Andrew de Quincey & Oliver Endriss" );
drivers/media/dvb-frontends/isl6423.c +1 -1
@@ -289,7 +289,7 @@ exit: fe->sec_priv =NULL ;return NULL ; } -EXPORT_SYMBOL (isl6423_attach); +EXPORT_SYMBOL_GPL (isl6423_attach);MODULE_DESCRIPTION ("ISL6423 SEC" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/itd1000.c +1 -1
@@ -389,7 +389,7 @@ struct dvb_frontend *itd1000_attach(strureturn fe; } -EXPORT_SYMBOL (itd1000_attach); +EXPORT_SYMBOL_GPL (itd1000_attach);MODULE_AUTHOR ("Patrick Boettcher <[email protected]>" );MODULE_DESCRIPTION ("Integrant ITD1000 driver" );
drivers/media/dvb-frontends/ix2505v.c +1 -1
@@ -302,7 +302,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (ix2505v_attach); +EXPORT_SYMBOL_GPL (ix2505v_attach);module_param_named (debug, ix2505v_debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/l64781.c +1 -1
@@ -593,4 +593,4 @@ MODULE_DESCRIPTION("LSI L64781 DVB-T DemMODULE_AUTHOR ("Holger Waechtler, Marko Kohtala" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (l64781_attach); +EXPORT_SYMBOL_GPL (l64781_attach);
drivers/media/dvb-frontends/lg2160.c +1 -1
@@ -1426,7 +1426,7 @@ struct dvb_frontend *lg2160_attach(constreturn &state->frontend; } -EXPORT_SYMBOL (lg2160_attach); +EXPORT_SYMBOL_GPL (lg2160_attach);MODULE_DESCRIPTION ("LG Electronics LG216x ATSC/MH Demodulator Driver" );MODULE_AUTHOR ("Michael Krufky <[email protected]>" );
drivers/media/dvb-frontends/lgdt3305.c +1 -1
@@ -1148,7 +1148,7 @@ fail:kfree (state);return NULL ; } -EXPORT_SYMBOL (lgdt3305_attach); +EXPORT_SYMBOL_GPL (lgdt3305_attach);static const struct dvb_frontend_ops lgdt3304_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/lgdt3306a.c +1 -1
@@ -1881,7 +1881,7 @@ fail:kfree (state);return NULL ; } -EXPORT_SYMBOL (lgdt3306a_attach); +EXPORT_SYMBOL_GPL (lgdt3306a_attach);#ifdef DBG_DUMP
drivers/media/dvb-frontends/lgdt330x.c +1 -1
@@ -928,7 +928,7 @@ struct dvb_frontend *lgdt330x_attach(conreturn lgdt330x_get_dvb_frontend (client); } -EXPORT_SYMBOL (lgdt330x_attach); +EXPORT_SYMBOL_GPL (lgdt330x_attach);static const struct dvb_frontend_ops lgdt3302_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/lgs8gxx.c +1 -1
@@ -1043,7 +1043,7 @@ error_out:return NULL ; } -EXPORT_SYMBOL (lgs8gxx_attach); +EXPORT_SYMBOL_GPL (lgs8gxx_attach);MODULE_DESCRIPTION ("Legend Silicon LGS8913/LGS8GXX DMB-TH demodulator driver" );MODULE_AUTHOR ("David T. L. Wong <[email protected]>" );
drivers/media/dvb-frontends/lnbh25.c +1 -1
@@ -173,7 +173,7 @@ struct dvb_frontend *lnbh25_attach(struc __func__, priv->i2c_address);return fe; } -EXPORT_SYMBOL (lnbh25_attach); +EXPORT_SYMBOL_GPL (lnbh25_attach);MODULE_DESCRIPTION ("ST LNBH25 driver" );MODULE_AUTHOR ("[email protected]" );
drivers/media/dvb-frontends/lnbp21.c +2 -2
@@ -155,7 +155,7 @@ struct dvb_frontend *lnbh24_attach(strucreturn lnbx2x_attach (fe, i2c, override_set, override_clear, i2c_addr,LNBH24_TTX ); } -EXPORT_SYMBOL (lnbh24_attach); +EXPORT_SYMBOL_GPL (lnbh24_attach); struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set,
@@ -164,7 +164,7 @@ struct dvb_frontend *lnbp21_attach(strucreturn lnbx2x_attach (fe, i2c, override_set, override_clear,0x08 ,LNBP21_ISEL ); } -EXPORT_SYMBOL (lnbp21_attach); +EXPORT_SYMBOL_GPL (lnbp21_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic lnbp21, lnbh24" );MODULE_AUTHOR ("Oliver Endriss, Igor M. Liplianin" );
drivers/media/dvb-frontends/lnbp22.c +1 -1
@@ -125,7 +125,7 @@ struct dvb_frontend *lnbp22_attach(strucreturn fe; } -EXPORT_SYMBOL (lnbp22_attach); +EXPORT_SYMBOL_GPL (lnbp22_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic lnbp22" );MODULE_AUTHOR ("Dominik Kuhlen" );
drivers/media/dvb-frontends/m88ds3103.c +1 -1
@@ -1284,7 +1284,7 @@ struct dvb_frontend *m88ds3103_attach(co *tuner_i2c_adapter = pdata.get_i2c_adapter (client);return pdata.get_dvb_frontend (client); } -EXPORT_SYMBOL (m88ds3103_attach); +EXPORT_SYMBOL_GPL (m88ds3103_attach);static const struct dvb_frontend_ops m88ds3103_ops = { .delsys = {SYS_DVBS ,SYS_DVBS2 },
drivers/media/dvb-frontends/m88rs2000.c +1 -1
@@ -807,7 +807,7 @@ error:return NULL ; } -EXPORT_SYMBOL (m88rs2000_attach); +EXPORT_SYMBOL_GPL (m88rs2000_attach);MODULE_DESCRIPTION ("M88RS2000 DVB-S Demodulator driver" );MODULE_AUTHOR ("Malcolm Priestley [email protected]" );
drivers/media/dvb-frontends/mb86a16.c +1 -1
@@ -1851,6 +1851,6 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (mb86a16_attach); +EXPORT_SYMBOL_GPL (mb86a16_attach);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/mb86a20s.c +1 -1
@@ -2089,7 +2089,7 @@ struct dvb_frontend *mb86a20s_attach(condev_info (&i2c->dev,"Detected a Fujitsu mb86a20s frontend\n" );return &state->frontend; } -EXPORT_SYMBOL (mb86a20s_attach); +EXPORT_SYMBOL_GPL (mb86a20s_attach);static const struct dvb_frontend_ops mb86a20s_ops = { .delsys = {SYS_ISDBT },
drivers/media/dvb-frontends/mt312.c +1 -1
@@ -832,7 +832,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (mt312_attach); +EXPORT_SYMBOL_GPL (mt312_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/mt352.c +1 -1
@@ -593,4 +593,4 @@ MODULE_DESCRIPTION("Zarlink MT352 DVB-TMODULE_AUTHOR ("Holger Waechtler, Daniel Mack, Antonio Mancuso" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (mt352_attach); +EXPORT_SYMBOL_GPL (mt352_attach);
drivers/media/dvb-frontends/nxt200x.c +1 -1
@@ -1232,5 +1232,5 @@ MODULE_DESCRIPTION("NXT200X (ATSC 8VSB &MODULE_AUTHOR ("Kirk Lapray, Michael Krufky, Jean-Francois Thibert, and Taylor Jacob" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (nxt200x_attach); +EXPORT_SYMBOL_GPL (nxt200x_attach);
drivers/media/dvb-frontends/nxt6000.c +1 -1
@@ -621,4 +621,4 @@ MODULE_DESCRIPTION("NxtWave NXT6000 DVB-MODULE_AUTHOR ("Florian Schirmer" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (nxt6000_attach); +EXPORT_SYMBOL_GPL (nxt6000_attach);
drivers/media/dvb-frontends/or51132.c +1 -1
@@ -605,4 +605,4 @@ MODULE_AUTHOR("Kirk Lapray");MODULE_AUTHOR ("Trent Piepho" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (or51132_attach); +EXPORT_SYMBOL_GPL (or51132_attach);
drivers/media/dvb-frontends/or51211.c +1 -1
@@ -551,5 +551,5 @@ MODULE_DESCRIPTION("Oren OR51211 VSB [pcMODULE_AUTHOR ("Kirk Lapray" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (or51211_attach); +EXPORT_SYMBOL_GPL (or51211_attach);
drivers/media/dvb-frontends/s5h1409.c +1 -1
@@ -981,7 +981,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (s5h1409_attach); +EXPORT_SYMBOL_GPL (s5h1409_attach);static const struct dvb_frontend_ops s5h1409_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/s5h1411.c +1 -1
@@ -900,7 +900,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (s5h1411_attach); +EXPORT_SYMBOL_GPL (s5h1411_attach);static const struct dvb_frontend_ops s5h1411_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/s5h1420.c +1 -1
@@ -918,7 +918,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (s5h1420_attach); +EXPORT_SYMBOL_GPL (s5h1420_attach);static const struct dvb_frontend_ops s5h1420_ops = { .delsys = {SYS_DVBS },
drivers/media/dvb-frontends/s5h1432.c +1 -1
@@ -355,7 +355,7 @@ struct dvb_frontend *s5h1432_attach(consreturn &state->frontend; } -EXPORT_SYMBOL (s5h1432_attach); +EXPORT_SYMBOL_GPL (s5h1432_attach);static const struct dvb_frontend_ops s5h1432_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/s921.c +1 -1
@@ -495,7 +495,7 @@ struct dvb_frontend *s921_attach(const sreturn &state->frontend; } -EXPORT_SYMBOL (s921_attach); +EXPORT_SYMBOL_GPL (s921_attach);static const struct dvb_frontend_ops s921_ops = { .delsys = {SYS_ISDBT },
drivers/media/dvb-frontends/si21xx.c +1 -1
@@ -938,7 +938,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (si21xx_attach); +EXPORT_SYMBOL_GPL (si21xx_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/sp887x.c +1 -1
@@ -626,4 +626,4 @@ MODULE_PARM_DESC(debug, "Turn on/off froMODULE_DESCRIPTION ("Spase sp887x DVB-T demodulator driver" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (sp887x_attach); +EXPORT_SYMBOL_GPL (sp887x_attach);
drivers/media/dvb-frontends/stb0899_drv.c +1 -1
@@ -1638,7 +1638,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stb0899_attach); +EXPORT_SYMBOL_GPL (stb0899_attach);MODULE_PARM_DESC (verbose,"Set Verbosity level" );MODULE_AUTHOR ("Manu Abraham" );MODULE_DESCRIPTION ("STB0899 Multi-Std frontend" );
drivers/media/dvb-frontends/stb6000.c +1 -1
@@ -232,7 +232,7 @@ struct dvb_frontend *stb6000_attach(strureturn fe; } -EXPORT_SYMBOL (stb6000_attach); +EXPORT_SYMBOL_GPL (stb6000_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/stb6100.c +1 -1
@@ -557,7 +557,7 @@ static void stb6100_release(struct dvb_fkfree (state); } -EXPORT_SYMBOL (stb6100_attach); +EXPORT_SYMBOL_GPL (stb6100_attach);MODULE_PARM_DESC (verbose,"Set Verbosity level" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/stv0288.c +1 -1
@@ -590,7 +590,7 @@ error:return NULL ; } -EXPORT_SYMBOL (stv0288_attach); +EXPORT_SYMBOL_GPL (stv0288_attach);module_param (debug_legacy_dish_switch, int,0444 ); MODULE_PARM_DESC(debug_legacy_dish_switch,
drivers/media/dvb-frontends/stv0297.c +1 -1
@@ -710,4 +710,4 @@ MODULE_DESCRIPTION("ST STV0297 DVB-C DemMODULE_AUTHOR ("Dennis Noermann and Andrew de Quincey" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (stv0297_attach); +EXPORT_SYMBOL_GPL (stv0297_attach);
drivers/media/dvb-frontends/stv0299.c +1 -1
@@ -751,4 +751,4 @@ MODULE_DESCRIPTION("ST STV0299 DVB DemodMODULE_AUTHOR ("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, Andreas Oberritter, Andrew de Quincey, Kenneth Aafly" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (stv0299_attach); +EXPORT_SYMBOL_GPL (stv0299_attach);
drivers/media/dvb-frontends/stv0367.c +3 -3
@@ -1750,7 +1750,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0367ter_attach); +EXPORT_SYMBOL_GPL (stv0367ter_attach);static int stv0367cab_gate_ctrl (struct dvb_frontend *fe,int enable) {
@@ -2923,7 +2923,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0367cab_attach); +EXPORT_SYMBOL_GPL (stv0367cab_attach);/* * Functions for operation on Digital Devices hardware
@@ -3344,7 +3344,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0367ddb_attach); +EXPORT_SYMBOL_GPL (stv0367ddb_attach);MODULE_PARM_DESC (debug,"Set debug" );MODULE_PARM_DESC (i2c_debug,"Set i2c debug" );
drivers/media/dvb-frontends/stv0900_core.c +1 -1
@@ -1957,7 +1957,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0900_attach); +EXPORT_SYMBOL_GPL (stv0900_attach);MODULE_PARM_DESC (debug,"Set debug" );
drivers/media/dvb-frontends/stv090x.c +1 -1
@@ -5073,7 +5073,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv090x_attach); +EXPORT_SYMBOL_GPL (stv090x_attach);static const struct i2c_device_id stv090x_id_table[] = { {"stv090x" ,0 },
drivers/media/dvb-frontends/stv6110.c +1 -1
@@ -427,7 +427,7 @@ struct dvb_frontend *stv6110_attach(strureturn fe; } -EXPORT_SYMBOL (stv6110_attach); +EXPORT_SYMBOL_GPL (stv6110_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/stv6110x.c +1 -1
@@ -469,7 +469,7 @@ const struct stv6110x_devctl *stv6110x_adev_info (&stv6110x->i2c->dev,"Attaching STV6110x\n" );return stv6110x->devctl; } -EXPORT_SYMBOL (stv6110x_attach); +EXPORT_SYMBOL_GPL (stv6110x_attach);static const struct i2c_device_id stv6110x_id_table[] = { {"stv6110x" ,0 },
drivers/media/dvb-frontends/tda10021.c +1 -1
@@ -513,4 +513,4 @@ MODULE_DESCRIPTION("Philips TDA10021 DVBMODULE_AUTHOR ("Ralph Metzler, Holger Waechtler, Markus Schulz" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10021_attach); +EXPORT_SYMBOL_GPL (tda10021_attach);
drivers/media/dvb-frontends/tda10023.c +1 -1
@@ -594,4 +594,4 @@ MODULE_DESCRIPTION("Philips TDA10023 DVBMODULE_AUTHOR ("Georg Acher, Hartmut Birr" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10023_attach); +EXPORT_SYMBOL_GPL (tda10023_attach);
drivers/media/dvb-frontends/tda10048.c +1 -1
@@ -1138,7 +1138,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (tda10048_attach); +EXPORT_SYMBOL_GPL (tda10048_attach);static const struct dvb_frontend_ops tda10048_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/tda1004x.c +2 -2
@@ -1378,5 +1378,5 @@ MODULE_DESCRIPTION("Philips TDA10045H &MODULE_AUTHOR ("Andrew de Quincey & Robert Schlabbach" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10045_attach); -EXPORT_SYMBOL (tda10046_attach); +EXPORT_SYMBOL_GPL (tda10045_attach); +EXPORT_SYMBOL_GPL (tda10046_attach);
drivers/media/dvb-frontends/tda10086.c +1 -1
@@ -764,4 +764,4 @@ MODULE_DESCRIPTION("Philips TDA10086 DVBMODULE_AUTHOR ("Andrew de Quincey" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10086_attach); +EXPORT_SYMBOL_GPL (tda10086_attach);
drivers/media/dvb-frontends/tda665x.c +1 -1
@@ -227,7 +227,7 @@ struct dvb_frontend *tda665x_attach(strureturn fe; } -EXPORT_SYMBOL (tda665x_attach); +EXPORT_SYMBOL_GPL (tda665x_attach);MODULE_DESCRIPTION ("TDA665x driver" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/tda8083.c +1 -1
@@ -481,4 +481,4 @@ MODULE_DESCRIPTION("Philips TDA8083 DVB-MODULE_AUTHOR ("Ralph Metzler, Holger Waechtler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda8083_attach); +EXPORT_SYMBOL_GPL (tda8083_attach);
drivers/media/dvb-frontends/tda8261.c +1 -1
@@ -188,7 +188,7 @@ exit:return NULL ; } -EXPORT_SYMBOL (tda8261_attach); +EXPORT_SYMBOL_GPL (tda8261_attach);MODULE_AUTHOR ("Manu Abraham" );MODULE_DESCRIPTION ("TDA8261 8PSK/QPSK Tuner" );
drivers/media/dvb-frontends/tda826x.c +1 -1
@@ -164,7 +164,7 @@ struct dvb_frontend *tda826x_attach(strureturn fe; } -EXPORT_SYMBOL (tda826x_attach); +EXPORT_SYMBOL_GPL (tda826x_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/ts2020.c +1 -1
@@ -525,7 +525,7 @@ struct dvb_frontend *ts2020_attach(strucreturn fe; } -EXPORT_SYMBOL (ts2020_attach); +EXPORT_SYMBOL_GPL (ts2020_attach);/* * We implement own regmap locking due to legacy DVB attach which uses frontend
drivers/media/dvb-frontends/tua6100.c +1 -1
@@ -186,7 +186,7 @@ struct dvb_frontend *tua6100_attach(stru fe->tuner_priv = priv;return fe; } -EXPORT_SYMBOL (tua6100_attach); +EXPORT_SYMBOL_GPL (tua6100_attach);MODULE_DESCRIPTION ("DVB tua6100 driver" );MODULE_AUTHOR ("Andrew de Quincey" );
drivers/media/dvb-frontends/ves1820.c +1 -1
@@ -434,4 +434,4 @@ MODULE_DESCRIPTION("VLSI VES1820 DVB-C DMODULE_AUTHOR ("Ralph Metzler, Holger Waechtler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (ves1820_attach); +EXPORT_SYMBOL_GPL (ves1820_attach);
drivers/media/dvb-frontends/ves1x93.c +1 -1
@@ -540,4 +540,4 @@ MODULE_DESCRIPTION("VLSI VES1x93 DVB-S DMODULE_AUTHOR ("Ralph Metzler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (ves1x93_attach); +EXPORT_SYMBOL_GPL (ves1x93_attach);
drivers/media/dvb-frontends/zl10036.c +1 -1
@@ -496,7 +496,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (zl10036_attach); +EXPORT_SYMBOL_GPL (zl10036_attach);module_param_named (debug, zl10036_debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/zl10039.c +1 -1
@@ -295,7 +295,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (zl10039_attach); +EXPORT_SYMBOL_GPL (zl10039_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/zl10353.c +1 -1
@@ -665,4 +665,4 @@ MODULE_DESCRIPTION("Zarlink ZL10353 DVB-MODULE_AUTHOR ("Chris Pascoe" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (zl10353_attach); +EXPORT_SYMBOL_GPL (zl10353_attach);
drivers/media/pci/bt8xx/dst.c +1 -1
@@ -1722,7 +1722,7 @@ struct dst_state *dst_attach(struct dst_return state;/* Manu (DST is a card not a frontend) */ } -EXPORT_SYMBOL (dst_attach); +EXPORT_SYMBOL_GPL (dst_attach);static const struct dvb_frontend_ops dst_dvbt_ops = { .delsys = {SYS_DVBT },
drivers/media/pci/bt8xx/dst_ca.c +1 -1
@@ -668,7 +668,7 @@ struct dvb_device *dst_ca_attach(structreturn NULL ; } -EXPORT_SYMBOL (dst_ca_attach); +EXPORT_SYMBOL_GPL (dst_ca_attach);MODULE_DESCRIPTION ("DST DVB-S/T/C Combo CA driver" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/tuners/fc0011.c +1 -1
@@ -499,7 +499,7 @@ struct dvb_frontend *fc0011_attach(strucreturn fe; } -EXPORT_SYMBOL (fc0011_attach); +EXPORT_SYMBOL_GPL (fc0011_attach);MODULE_DESCRIPTION ("Fitipower FC0011 silicon tuner driver" );MODULE_AUTHOR ("Michael Buesch <[email protected]>" );
drivers/media/tuners/fc0012.c +1 -1
@@ -495,7 +495,7 @@ err:return fe; } -EXPORT_SYMBOL (fc0012_attach); +EXPORT_SYMBOL_GPL (fc0012_attach);MODULE_DESCRIPTION ("Fitipower FC0012 silicon tuner driver" );MODULE_AUTHOR ("Hans-Frieder Vogt <[email protected]>" );
drivers/media/tuners/fc0013.c +1 -1
@@ -608,7 +608,7 @@ struct dvb_frontend *fc0013_attach(strucreturn fe; } -EXPORT_SYMBOL (fc0013_attach); +EXPORT_SYMBOL_GPL (fc0013_attach);MODULE_DESCRIPTION ("Fitipower FC0013 silicon tuner driver" );MODULE_AUTHOR ("Hans-Frieder Vogt <[email protected]>" );
drivers/media/tuners/max2165.c +1 -1
@@ -410,7 +410,7 @@ struct dvb_frontend *max2165_attach(strureturn fe; } -EXPORT_SYMBOL (max2165_attach); +EXPORT_SYMBOL_GPL (max2165_attach);MODULE_AUTHOR ("David T. L. Wong <[email protected]>" );MODULE_DESCRIPTION ("Maxim MAX2165 silicon tuner driver" );
drivers/media/tuners/mc44s803.c +1 -1
@@ -356,7 +356,7 @@ error:kfree (priv);return NULL ; } -EXPORT_SYMBOL (mc44s803_attach); +EXPORT_SYMBOL_GPL (mc44s803_attach);MODULE_AUTHOR ("Jochen Friedrich" );MODULE_DESCRIPTION ("Freescale MC44S803 silicon tuner driver" );
drivers/media/tuners/mt2060.c +1 -1
@@ -440,7 +440,7 @@ struct dvb_frontend * mt2060_attach(strureturn fe; } -EXPORT_SYMBOL (mt2060_attach); +EXPORT_SYMBOL_GPL (mt2060_attach);static int mt2060_probe (struct i2c_client *client,const struct i2c_device_id *id)
drivers/media/tuners/mt2131.c +1 -1
@@ -274,7 +274,7 @@ struct dvb_frontend * mt2131_attach(stru fe->tuner_priv = priv;return fe; } -EXPORT_SYMBOL (mt2131_attach); +EXPORT_SYMBOL_GPL (mt2131_attach);MODULE_AUTHOR ("Steven Toth" );MODULE_DESCRIPTION ("Microtune MT2131 silicon tuner driver" );
drivers/media/tuners/mt2266.c +1 -1
@@ -336,7 +336,7 @@ struct dvb_frontend * mt2266_attach(strumt2266_calibrate (priv);return fe; } -EXPORT_SYMBOL (mt2266_attach); +EXPORT_SYMBOL_GPL (mt2266_attach);MODULE_AUTHOR ("Olivier DANET" );MODULE_DESCRIPTION ("Microtune MT2266 silicon tuner driver" );
drivers/media/tuners/mxl5005s.c +1 -1
@@ -4114,7 +4114,7 @@ struct dvb_frontend *mxl5005s_attach(str fe->tuner_priv = state;return fe; } -EXPORT_SYMBOL (mxl5005s_attach); +EXPORT_SYMBOL_GPL (mxl5005s_attach);MODULE_DESCRIPTION ("MaxLinear MXL5005S silicon tuner driver" );MODULE_AUTHOR ("Steven Toth" );
drivers/media/tuners/qt1010.c +1 -1
@@ -437,7 +437,7 @@ struct dvb_frontend * qt1010_attach(stru fe->tuner_priv = priv;return fe; } -EXPORT_SYMBOL (qt1010_attach); +EXPORT_SYMBOL_GPL (qt1010_attach);MODULE_DESCRIPTION ("Quantek QT1010 silicon tuner driver" );MODULE_AUTHOR ("Antti Palosaari <[email protected]>" );
drivers/media/tuners/tda18218.c +1 -1
@@ -336,7 +336,7 @@ struct dvb_frontend *tda18218_attach(strreturn fe; } -EXPORT_SYMBOL (tda18218_attach); +EXPORT_SYMBOL_GPL (tda18218_attach);MODULE_DESCRIPTION ("NXP TDA18218HN silicon tuner driver" );MODULE_AUTHOR ("Antti Palosaari <[email protected]>" );
drivers/media/tuners/xc4000.c +1 -1
@@ -1744,7 +1744,7 @@ fail2:xc4000_release (fe);return NULL ; } -EXPORT_SYMBOL (xc4000_attach); +EXPORT_SYMBOL_GPL (xc4000_attach);MODULE_AUTHOR ("Steven Toth, Davide Ferri" );MODULE_DESCRIPTION ("Xceive xc4000 silicon tuner driver" );
drivers/media/tuners/xc5000.c +1 -1
@@ -1460,7 +1460,7 @@ fail:xc5000_release (fe);return NULL ; } -EXPORT_SYMBOL (xc5000_attach); +EXPORT_SYMBOL_GPL (xc5000_attach);MODULE_AUTHOR ("Steven Toth" );MODULE_DESCRIPTION ("Xceive xc5000 silicon tuner driver" );
Greg Kroah-Hartman
maintainerPATCH 219/367 ntb: Drop packets when qp link is down
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
commit f195a1a6fe416882984f8bd6c61afc1383171860 upstream.
Currently when the transport receive packets after netdev has closed the transport returns error and triggers tx errors to be incremented and carrier to be stopped. There is no reason to return error if the device is already closed. Drop the packet and return 0.
--- drivers/ntb/ntb_transport.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/ntb/ntb_transport.c +5 -1
@@ -2278,9 +2278,13 @@ int ntb_transport_tx_enqueue(struct ntb_struct ntb_queue_entry *entry;int rc; -if (!qp || !qp->link_is_up || !len) +if (!qp || !len)return -EINVAL ; +/* If the qp link is down already, just ignore. */ +if (!qp->link_is_up) +return 0 ; + entry =ntb_list_rm (&qp->ntb_tx_free_q_lock, &qp->tx_free_q);if (!entry) { qp->tx_err_no_buf++;
Greg Kroah-Hartman
maintainerPATCH 220/367 ntb: Clean up tx tail index on link down
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
commit cc79bd2738c2d40aba58b2be6ce47dc0e471df0e upstream.
The tx tail index is not reset when the link goes down. This causes the tail index to go out of sync when the link goes down and comes back up. Refactor the ntb_qp_link_down_reset() and reset the tail index as well.
--- drivers/ntb/ntb_transport.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/ntb/ntb_transport.c +9 -2
@@ -911,7 +911,7 @@ static int ntb_set_mw(struct ntb_transporeturn 0 ; } -static void ntb_qp_link_down_reset (struct ntb_transport_qp *qp) +static void ntb_qp_link_context_reset (struct ntb_transport_qp *qp) { qp->link_is_up = false; qp->active = false;
@@ -934,6 +934,13 @@ static void ntb_qp_link_down_reset(struc qp->tx_async =0 ; } +static void ntb_qp_link_down_reset (struct ntb_transport_qp *qp) +{ +ntb_qp_link_context_reset (qp); +if (qp->remote_rx_info) + qp->remote_rx_info->entry = qp->rx_max_entry -1 ; +} +static void ntb_qp_link_cleanup (struct ntb_transport_qp *qp) {struct ntb_transport_ctx *nt = qp->transport;
@@ -1176,7 +1183,7 @@ static int ntb_transport_init_queue(stru qp->ndev = nt->ndev; qp->client_ready = false; qp->event_handler =NULL ; -ntb_qp_link_down_reset (qp); +ntb_qp_link_context_reset (qp);if (mw_num < qp_count % mw_count) num_qps_mw = qp_count / mw_count +1 ;
Greg Kroah-Hartman
maintainerPATCH 221/367 ntb: Fix calculation ntb_transport_tx_free_entry()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
commit 5a7693e6bbf19b22fd6c1d2c4b7beb0a03969e2c upstream.
ntb_transport_tx_free_entry() never returns 0 with the current calculation. If head == tail, then it would return qp->tx_max_entry. Change compare to tail >= head and when they are equal, a 0 would be returned.
--- drivers/ntb/ntb_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/ntb_transport.c +1 -1
@@ -2431,7 +2431,7 @@ unsigned int ntb_transport_tx_free_entryunsigned int head = qp->tx_index;unsigned int tail = qp->remote_rx_info->entry; -return tail > head ? tail - head : qp->tx_max_entry + tail - head; +return tail >= head ? tail - head : qp->tx_max_entry + tail - head; }EXPORT_SYMBOL_GPL (ntb_transport_tx_free_entry);
Greg Kroah-Hartman
maintainerPATCH 222/367 Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset"
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
commit 5260bd6d36c83c5b269c33baaaf8c78e520908b0 upstream.
This reverts commit d5af729dc2071273f14cbb94abbc60608142fd83.
d5af729dc207 ("PCI: Mark NVIDIA T4 GPUs to avoid bus reset") avoided Secondary Bus Reset on the T4 because the reset seemed to not work when the T4 was directly attached to a Root Port.
But NVIDIA thinks the issue is probably related to some issue with the Root Port, not with the T4. The T4 provides neither PM nor FLR reset, so masking bus reset compromises this device for assignment scenarios.
Revert d5af729dc207 as requested by Wu Zongyong. This will leave SBR broken in the specific configuration Wu tested, as it was in v6.5, so Wu will debug that further.
--- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/quirks.c +1 -1
@@ -3566,7 +3566,7 @@ static void quirk_no_bus_reset(struct pc*/ static void quirk_nvidia_no_bus_reset (struct pci_dev *dev) { -if ((dev->device &0xffc0 ) ==0x2340 || dev->device ==0x1eb8 ) +if ((dev->device &0xffc0 ) ==0x2340 )quirk_no_bus_reset (dev); } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
Greg Kroah-Hartman
maintainerPATCH 223/367 procfs: block chmod on /proc/thread-self/comm
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksa Sarai <[email protected]>
commit ccf61486fe1e1a48e18c638d1813cda77b3c0737 upstream.
Due to an oversight in commit 1b3044e39a89 ("procfs: fix pthread cross-thread naming if !PR_DUMPABLE") in switching from REG to NOD, chmod operations on /proc/thread-self/comm were no longer blocked as they are on almost all other procfs files.
A very similar situation with /proc/self/environ was used to as a root exploit a long time ago, but procfs has SB_I_NOEXEC so this is simply a correctness issue.
Ref: https://lwn.net/Articles/191954/
Ref: 6d76fa58b050 ("Don't allow chmod() on the /proc/<pid>/ files")
Message-Id: <[email protected]>
--- fs/proc/base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/proc/base.c +2 -1
@@ -3412,7 +3412,8 @@ static int proc_tid_comm_permission(stru }static const struct inode_operations proc_tid_comm_inode_operations = { - .permission = proc_tid_comm_permission, + .setattr = proc_setattr, + .permission = proc_tid_comm_permission, };/*
Greg Kroah-Hartman
maintainerPATCH 224/367 parisc: Fix /proc/cpuinfo output for lscpu
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 9f5ba4b3e1b3c123eeca5d2d09161e8720048b5c upstream.
The lscpu command is broken since commit cab56b51ec0e ("parisc: Fix device names in /proc/iomem") added the PA pathname to all PA devices, includig the CPUs.
lscpu parses /proc/cpuinfo and now believes it found different CPU types since every CPU is listed with an unique identifier (PA pathname).
Fix this problem by simply dropping the PA pathname when listing the CPUs in /proc/cpuinfo. There is no need to show the pathname in this procfs file.
--- arch/parisc/kernel/processor.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
arch/parisc/kernel/processor.c +10 -3
@@ -373,10 +373,18 @@ int show_cpuinfo (struct seq_file *m, void *v) { unsigned long cpu; +char cpu_name[60 ], *p; + +/* strip PA path from CPU name to not confuse lscpu */ +strlcpy (cpu_name,per_cpu (cpu_data,0 ).dev->name,sizeof (cpu_name)); + p =strrchr (cpu_name,'[' ); +if (p) + *(--p) =0 ;for_each_online_cpu (cpu) { -const struct cpuinfo_parisc *cpuinfo = &per_cpu (cpu_data, cpu);#ifdef CONFIG_SMP +const struct cpuinfo_parisc *cpuinfo = &per_cpu (cpu_data, cpu); +if (0 == cpuinfo->hpa)continue ;#endif
@@ -421,8 +429,7 @@ show_cpuinfo (struct seq_file *m, void *seq_printf (m,"model\t\t: %s - %s\n" , boot_cpu_data.pdc.sys_model_name, - cpuinfo->dev ? - cpuinfo->dev->name :"Unknown" ); + cpu_name); seq_printf(m, "hversion\t: 0x%08x\n" "sversion\t: 0x%08x\n",
Greg Kroah-Hartman
maintainerPATCH 225/367 dlm: fix plock lookup when using multiple lockspaces
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Aring <[email protected]>
commit 7c53e847ff5e97f033fdd31f71949807633d506b upstream.
All posix lock ops, for all lockspaces (gfs2 file systems) are sent to userspace (dlm_controld) through a single misc device. The dlm_controld daemon reads the ops from the misc device and sends them to other cluster nodes using separate, per-lockspace cluster api communication channels. The ops for a single lockspace are ordered at this level, so that the results are received in the same sequence that the requests were sent. When the results are sent back to the kernel via the misc device, they are again funneled through the single misc device for all lockspaces. When the dlm code in the kernel processes the results from the misc device, these results will be returned in the same sequence that the requests were sent, on a per-lockspace basis. A recent change in this request/reply matching code missed the "per-lockspace" check (fsid comparison) when matching request and reply, so replies could be incorrectly matched to requests from other lockspaces.
--- fs/dlm/plock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/dlm/plock.c +3 -3
@@ -466,7 +466,8 @@ static ssize_t dev_write(struct file *fi } }else {list_for_each_entry (iter, &recv_list, list) { -if (!iter->info.wait) { +if (!iter->info.wait && + iter->info.fsid == info.fsid) { op = iter;break ; }
@@ -478,8 +479,7 @@ static ssize_t dev_write(struct file *fiif (info.wait)WARN_ON (op->info.optype !=DLM_PLOCK_OP_LOCK );else -WARN_ON (op->info.fsid != info.fsid || - op->info.number != info.number || +WARN_ON (op->info.number != info.number || op->info.owner != info.owner || op->info.optype != info.optype);
Greg Kroah-Hartman
maintainerPATCH 226/367 dccp: Fix out of bounds access in DCCP error handler
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit 977ad86c2a1bcaf58f01ab98df5cc145083c489c upstream.
There was a previous attempt to fix an out-of-bounds access in the DCCP error handlers, but that fix assumed that the error handlers only want to access the first 8 bytes of the DCCP header. Actually, they also look at the DCCP sequence number, which is stored beyond 8 bytes, so an explicit pskb_may_pull() is required.
--- net/dccp/ipv4.c | 13 +++++++++---- net/dccp/ipv6.c | 15 ++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-)
net/dccp/ipv4.c +9 -4
@@ -243,12 +243,17 @@ static int dccp_v4_err(struct sk_buff *sint err;struct net *net =dev_net (skb->dev); -/* Only need dccph_dport & dccph_sport which are the first -* 4 bytes in dccp header. +/* For the first __dccp_basic_hdr_len() check, we only need dh->dccph_x, +* which is in byte 7 of the dccp header. * Our caller (icmp_socket_deliver()) already pulled 8 bytes for us. +* +* Later on, we want to access the sequence number fields, which are +* beyond 8 bytes, so we have to pskb_may_pull() ourselves. */ - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8); - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8); + dh = (struct dccp_hdr *)(skb->data + offset); +if (!pskb_may_pull (skb, offset +__dccp_basic_hdr_len (dh))) +return -EINVAL ; + iph = (struct iphdr *)skb->data; dh = (struct dccp_hdr *)(skb->data + offset); sk = __inet_lookup_established(net, &dccp_hashinfo,
net/dccp/ipv6.c +10 -5
@@ -67,7 +67,7 @@ static inline __u64 dccp_v6_init_sequencstatic int dccp_v6_err (struct sk_buff *skb,struct inet6_skb_parm *opt,u8 type,u8 code,int offset,__be32 info) { -const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data; +const struct ipv6hdr *hdr;const struct dccp_hdr *dh;struct dccp_sock *dp;struct ipv6_pinfo *np;
@@ -76,12 +76,17 @@ static int dccp_v6_err(struct sk_buff *s__u64 seq;struct net *net =dev_net (skb->dev); -/* Only need dccph_dport & dccph_sport which are the first -* 4 bytes in dccp header. +/* For the first __dccp_basic_hdr_len() check, we only need dh->dccph_x, +* which is in byte 7 of the dccp header. * Our caller (icmpv6_notify()) already pulled 8 bytes for us. +* +* Later on, we want to access the sequence number fields, which are +* beyond 8 bytes, so we have to pskb_may_pull() ourselves. */ - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8); - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8); + dh = (struct dccp_hdr *)(skb->data + offset); +if (!pskb_may_pull (skb, offset +__dccp_basic_hdr_len (dh))) +return -EINVAL ; + hdr = (const struct ipv6hdr *)skb->data; dh = (struct dccp_hdr *)(skb->data + offset); sk = __inet6_lookup_established(net, &dccp_hashinfo,
Greg Kroah-Hartman
maintainerPATCH 227/367 X.509: if signature is unsupported skip validation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thore Sommer <[email protected]>
commit ef5b52a631f8c18353e80ccab8408b963305510c upstream.
When the hash algorithm for the signature is not available the digest size is 0 and the signature in the certificate is marked as unsupported.
When validating a self-signed certificate, this needs to be checked, because otherwise trying to validate the signature will fail with an warning:
Loading compiled-in X.509 certificates
WARNING: CPU: 0 PID: 1 at crypto/rsa-pkcs1pad.c:537 \ pkcs1pad_verify+0x46/0x12c
...
Problem loading in-kernel X.509 certificate (-22)
--- crypto/asymmetric_keys/x509_public_key.c | 5 +++++ 1 file changed, 5 insertions(+)
crypto/asymmetric_keys/x509_public_key.c +5 -0
@@ -129,6 +129,11 @@ int x509_check_for_self_signed(struct x5if (strcmp (cert->pub->pkey_algo, cert->sig->pkey_algo) !=0 ) goto out; +if (cert->unsupported_sig) { + ret =0 ; + goto out; + } + ret =public_key_verify_signature (cert->pub, cert->sig);if (ret <0 ) {if (ret == -ENOPKG ) {
Greg Kroah-Hartman
maintainerPATCH 228/367 net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Dichtel <[email protected]>
commit a4f39c9f14a634e4cd35fcd338c239d11fcc73fc upstream.
The goal is to support a bpf_redirect() from an ethernet device (ingress) to a ppp device (egress).
The l2 header is added automatically by the ppp driver, thus the ethernet header should be removed.
--- include/linux/if_arp.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/if_arp.h +4 -0
@@ -52,6 +52,10 @@ static inline bool dev_is_mac_header_xmicase ARPHRD_NONE :case ARPHRD_RAWIP :case ARPHRD_PIMREG : +/* PPP adds its l2 header automatically in ppp_start_xmit(). +* This makes it look like an l3 device to __bpf_redirect() and tcf_mirred_init(). +*/ +case ARPHRD_PPP :return false;default :return true;
Greg Kroah-Hartman
maintainerPATCH 229/367 fsverity: skip PKCS#7 parser when keyring is empty
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit 919dc320956ea353a7fb2d84265195ad5ef525ac upstream.
If an fsverity builtin signature is given for a file but the ".fs-verity" keyring is empty, there's no real reason to run the PKCS#7 parser. Skip this to avoid the PKCS#7 attack surface when builtin signature support is configured into the kernel but is not being used.
This is a hardening improvement, not a fix per se, but I've added Fixes and Cc stable to get it out to more users.
--- fs/verity/signature.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/verity/signature.c +16 -0
@@ -58,6 +58,22 @@ int fsverity_verify_signature(const strureturn -EBADMSG ; } +if (fsverity_keyring->keys.nr_leaves_on_tree ==0 ) { +/* +* The ".fs-verity" keyring is empty, due to builtin signatures +* being supported by the kernel but not actually being used. +* In this case, verify_pkcs7_signature() would always return an +* error, usually ENOKEY. It could also be EBADMSG if the +* PKCS#7 is malformed, but that isn't very important to +* distinguish. So, just skip to ENOKEY to avoid the attack +* surface of the PKCS#7 parser, which would otherwise be +* reachable by any task able to execute FS_IOC_ENABLE_VERITY. +*/ +fsverity_err (inode, +"fs-verity keyring is empty, rejecting signed file!" ); +return -ENOKEY ; + } + d =kzalloc (sizeof (*d) + hash_alg->digest_size,GFP_KERNEL );if (!d)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 230/367 pstore/ram: Check start of empty przs during init
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Enlin Mu <[email protected]>
commit fe8c3623ab06603eb760444a032d426542212021 upstream.
After commit 30696378f68a ("pstore/ram: Do not treat empty buffers as valid"), initialization would assume a prz was valid after seeing that the buffer_size is zero (regardless of the buffer start position). This unchecked start value means it could be outside the bounds of the buffer, leading to future access panics when written to:
sysdump_panic_event+0x3b4/0x5b8 atomic_notifier_call_chain+0x54/0x90 panic+0x1c8/0x42c die+0x29c/0x2a8 die_kernel_fault+0x68/0x78 __do_kernel_fault+0x1c4/0x1e0 do_bad_area+0x40/0x100 do_translation_fault+0x68/0x80 do_mem_abort+0x68/0xf8 el1_da+0x1c/0xc0 __raw_writeb+0x38/0x174 __memcpy_toio+0x40/0xac persistent_ram_update+0x44/0x12c persistent_ram_write+0x1a8/0x1b8 ramoops_pstore_write+0x198/0x1e8 pstore_console_write+0x94/0xe0 ...
To avoid this, also check if the prz start is 0 during the initialization phase. If not, the next prz sanity check case will discover it (start > size) and zap the buffer back to a sane state.
--- fs/pstore/ram_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/pstore/ram_core.c +1 -1
@@ -506,7 +506,7 @@ static int persistent_ram_post_init(stru sig ^=PERSISTENT_RAM_SIG ;if (prz->buffer->sig == sig) { -if (buffer_size (prz) ==0 ) { +if (buffer_size (prz) ==0 &&buffer_start (prz) ==0 ) {pr_debug ("found existing empty buffer\n" );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 231/367 s390/ipl: add missing secure/has_secure file to ipl type unknown
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Schnelle <[email protected]>
commit ea5717cb13468323a7c3dd394748301802991f39 upstream.
OS installers are relying on /sys/firmware/ipl/has_secure to be present on machines supporting secure boot. This file is present for all IPL types, but not the unknown type, which prevents a secure installation when an LPAR is booted in HMC via FTP(s), because this is an unknown IPL type in linux. While at it, also add the secure file.
--- arch/s390/kernel/ipl.c | 2 ++ 1 file changed, 2 insertions(+)
arch/s390/kernel/ipl.c +2 -0
@@ -429,6 +429,8 @@ static struct attribute_group ipl_ccw_atstatic struct attribute *ipl_unknown_attrs[] = { &sys_ipl_type_attr.attr, + &sys_ipl_secure_attr.attr, + &sys_ipl_has_secure_attr.attr,NULL , };
Greg Kroah-Hartman
maintainerPATCH 232/367 crypto: stm32 - fix loop iterating through scatterlist for DMA
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Bourgoin <[email protected]>
commit d9c83f71eeceed2cb54bb78be84f2d4055fd9a1f upstream.
We were reading the length of the scatterlist sg after copying value of tsg inside.
So we are using the size of the previous scatterlist and for the first one we are using an unitialised value.
Fix this by copying tsg in sg[0] before reading the size.
--- drivers/crypto/stm32/stm32-hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/stm32/stm32-hash.c +1 -1
@@ -562,9 +562,9 @@ static int stm32_hash_dma_send(struct st }for_each_sg (rctx->sg, tsg, rctx->nents, i) { + sg[0 ] = *tsg; len = sg->length; - sg[0 ] = *tsg;if (sg_is_last (sg)) {if (hdev->dma_mode ==1 ) { len = (ALIGN (sg->length,16 ) -16 );
Greg Kroah-Hartman
maintainerPATCH 233/367 cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit e520d0b6be950ce3738cf4b9bd3b392be818f1dc upstream.
Allocate extra space for terminating element at:
drivers/cpufreq/brcmstb-avs-cpufreq.c:
449 table[i].frequency = CPUFREQ_TABLE_END;
and add code comment to make this clear.
This fixes the following -Warray-bounds warning seen after building
ARM with multi_v7_defconfig (GCC 13):
In function 'brcm_avs_get_freq_table',
inlined from 'brcm_avs_cpufreq_init' at drivers/cpufreq/brcmstb-avs-cpufreq.c:623:15:drivers/cpufreq/brcmstb-avs-cpufreq.c:449:28: warning: array subscript 5 is outside array bounds of 'void[60]' [-Warray-bounds=]
449 | table[i].frequency = CPUFREQ_TABLE_END;
In file included from include/linux/node.h:18,
from include/linux/cpu.h:17,
from include/linux/cpufreq.h:12,
from drivers/cpufreq/brcmstb-avs-cpufreq.c:44:
In function 'devm_kmalloc_array',
inlined from 'devm_kcalloc' at include/linux/device.h:328:9,
inlined from 'brcm_avs_get_freq_table' at drivers/cpufreq/brcmstb-avs-cpufreq.c:437:10,
inlined from 'brcm_avs_cpufreq_init' at drivers/cpufreq/brcmstb-avs-cpufreq.c:623:15:include/linux/device.h:323:16: note: at offset 60 into object of size 60 allocated by 'devm_kmalloc'
323 | return devm_kmalloc(dev, bytes, flags);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -Warray-bounds.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +5 -1
@@ -410,7 +410,11 @@ brcm_avs_get_freq_table(struct device *dif (ret)return ERR_PTR (ret); - table =devm_kcalloc (dev,AVS_PSTATE_MAX +1 ,sizeof (*table), +/* +* We allocate space for the 5 different P-STATES AVS, +* plus extra space for a terminating element. +*/ + table =devm_kcalloc (dev,AVS_PSTATE_MAX +1 +1 ,sizeof (*table),GFP_KERNEL );if (!table)return ERR_PTR (-ENOMEM );
Greg Kroah-Hartman
maintainerPATCH 234/367 sc16is7xx: Set iobase to device index
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Mack <[email protected]>
[ Upstream commit 5da6b1c079e6804a81e63ab8337224cbd2148c91 ]
Some derivates of sc16is7xx devices expose more than one tty device to userspace. If multiple such devices exist in a system, userspace currently has no clean way to infer which tty maps to which physical line.
Set the .iobase value to the relative index within the device to allow infering the order through sysfs.
Stable-dep-of: 2861ed4d6e6d ("serial: sc16is7xx: fix broken port 0 uart init")
--- drivers/tty/serial/sc16is7xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/tty/serial/sc16is7xx.c +1 -0
@@ -1270,6 +1270,7 @@ static int sc16is7xx_probe(struct device *dev, s->p[i].port.type =PORT_SC16IS7XX ; s->p[i].port.fifosize =SC16IS7XX_FIFO_SIZE ; s->p[i].port.flags =UPF_FIXED_TYPE |UPF_LOW_LATENCY ; + s->p[i].port.iobase = i; s->p[i].port.iotype =UPIO_PORT ; s->p[i].port.uartclk = freq; s->p[i].port.rs485_config = sc16is7xx_config_rs485;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 235/367 serial: sc16is7xx: fix broken port 0 uart init
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
[ Upstream commit 2861ed4d6e6d1a2c9de9bf5b0abd996c2dc673d0 ]
The sc16is7xx_config_rs485() function is called only for the second port (index 1, channel B), causing initialization problems for the first port.
For the sc16is7xx driver, port->membase and port->mapbase are not set, and their default values are 0. And we set port->iobase to the device index. This means that when the first device is registered using the uart_add_one_port() function, the following values will be in the port structure:
port->membase = 0
port->mapbase = 0
port->iobase = 0Therefore, the function uart_configure_port() in serial_core.c will exit early because of the following check:
/* * If there isn't a port here, don't do anything further. */ if (!port->iobase && !port->mapbase && !port->membase) return;
Typically, I2C and SPI drivers do not set port->membase and port->mapbase.
The max310x driver sets port->membase to ~0 (all ones). By implementing the same change in this driver, uart_configure_port() is now correctly executed for all ports.
--- drivers/tty/serial/sc16is7xx.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/sc16is7xx.c +6 -0
@@ -1271,6 +1271,12 @@ static int sc16is7xx_probe(struct device *dev, s->p[i].port.fifosize =SC16IS7XX_FIFO_SIZE ; s->p[i].port.flags =UPF_FIXED_TYPE |UPF_LOW_LATENCY ; s->p[i].port.iobase = i; +/* +* Use all ones as membase to make sure uart_configure_port() in +* serial_core.c does not abort for SPI/I2C devices where the +* membase address is not applicable. +*/ + s->p[i].port.membase = (void __iomem *)~0 ; s->p[i].port.iotype =UPIO_PORT ; s->p[i].port.uartclk = freq; s->p[i].port.rs485_config = sc16is7xx_config_rs485;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 236/367 usb: typec: tcpci: clear the fault status bit
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Felsch <[email protected]>
[ Upstream commit 23e60c8daf5ec2ab1b731310761b668745fcf6ed ]
According the "USB Type-C Port Controller Interface Specification v2.0" the TCPC sets the fault status register bit-7 (AllRegistersResetToDefault) once the registers have been reset to their default values.
This triggers an alert(-irq) on PTN5110 devices albeit we do mask the fault-irq, which may cause a kernel hang. Fix this generically by writing a one to the corresponding bit-7.
--- drivers/usb/typec/tcpm/tcpci.c | 4 ++++ drivers/usb/typec/tcpm/tcpci.h | 1 + 2 files changed, 5 insertions(+)
drivers/usb/typec/tcpm/tcpci.c +4 -0
@@ -379,6 +379,10 @@ static int tcpci_init(struct tcpc_dev *tcpc)if (time_after (jiffies, timeout))return -ETIMEDOUT ; + ret =tcpci_write16 (tcpci,TCPC_FAULT_STATUS ,TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT ); +if (ret <0 ) +return ret; +/* Handle vendor init */ if (tcpci->data->init) { ret = tcpci->data->init (tcpci, tcpci->data);
drivers/usb/typec/tcpm/tcpci.h +1 -0
@@ -72,6 +72,7 @@#define TCPC_POWER_STATUS_VBUS_PRES BIT(2)#define TCPC_FAULT_STATUS 0x1f +#define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7)#define TCPC_COMMAND 0x23#define TCPC_CMD_WAKE_I2C 0x11
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 237/367 udf: initialize newblock to 0
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Rix <[email protected]>
commit 23970a1c9475b305770fd37bebfec7a10f263787 upstream.
The clang build reports this errorfs/udf/inode.c:805:6: error: variable 'newblock' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
if (*err < 0)
^~~~~~~~newblock is never set before error handling jump. Initialize newblock to 0 and remove redundant settings.
Message-Id: <[email protected]>
--- fs/udf/inode.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/udf/inode.c +1 -3
@@ -698,7 +698,7 @@ static sector_t inode_getblk(struct inodstruct kernel_lb_addr eloc, tmpeloc;int c =1 ;loff_t lbcount =0 , b_off =0 ; -udf_pblk_t newblocknum, newblock; +udf_pblk_t newblocknum, newblock =0 ;sector_t offset =0 ;int8_t etype;struct udf_inode_info *iinfo =UDF_I (inode);
@@ -801,7 +801,6 @@ static sector_t inode_getblk(struct inod ret =udf_do_extend_file (inode, &prev_epos, laarr, hole_len);if (ret <0 ) { *err = ret; - newblock =0 ; goto out_free; } c =0 ;
@@ -864,7 +863,6 @@ static sector_t inode_getblk(struct inod goal, err);if (!newblocknum) { *err = -ENOSPC ; - newblock =0 ; goto out_free; }if (isBeyondEOF)
Greg Kroah-Hartman
maintainerPATCH 238/367 drm: fix double free for gbo in drm_gem_vram_init and drm_gem_vram_create
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jia Yang <[email protected]>
commit da62cb7230f0871c30dc9789071f63229158d261 upstream.
I got a use-after-free report when doing some fuzz test:
If ttm_bo_init() fails, the "gbo" and "gbo->bo.base" will be freed by ttm_buffer_object_destroy() in ttm_bo_init(). But then drm_gem_vram_create() and drm_gem_vram_init() will free "gbo" and "gbo->bo.base" again.
BUG: KMSAN: use-after-free in drm_vma_offset_remove+0xb3/0x150 CPU: 0 PID: 24282 Comm: syz-executor.1 Tainted: G B W 5.7.0-rc4-msan #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack dump_stack+0x1c9/0x220 kmsan_report+0xf7/0x1e0 __msan_warning+0x58/0xa0 drm_vma_offset_remove+0xb3/0x150 drm_gem_free_mmap_offset drm_gem_object_release+0x159/0x180 drm_gem_vram_init drm_gem_vram_create+0x7c5/0x990 drm_gem_vram_fill_create_dumb drm_gem_vram_driver_dumb_create+0x238/0x590 drm_mode_create_dumb drm_mode_create_dumb_ioctl+0x41d/0x450 drm_ioctl_kernel+0x5a4/0x710 drm_ioctl+0xc6f/0x1240 vfs_ioctl ksys_ioctl __do_sys_ioctl __se_sys_ioctl+0x2e9/0x410 __x64_sys_ioctl+0x4a/0x70 do_syscall_64+0xb8/0x160 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x4689b9 Code: fd e0 fa ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 cb e0 fa ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007f368fa4dc98 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 000000000076bf00 RCX: 00000000004689b9 RDX: 0000000020000240 RSI: 00000000c02064b2 RDI: 0000000000000003 RBP: 0000000000000004 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00000000004d17e0 R14: 00007f368fa4e6d4 R15: 000000000076bf0c
Uninit was created at:
kmsan_save_stack_with_flags
kmsan_internal_poison_shadow+0x66/0xd0 kmsan_slab_free+0x6e/0xb0 slab_free_freelist_hook slab_free kfree+0x571/0x30a0 drm_gem_vram_destroy ttm_buffer_object_destroy+0xc8/0x130 ttm_bo_release kref_put ttm_bo_put+0x117d/0x23e0 ttm_bo_init_reserved+0x11c0/0x11d0 ttm_bo_init+0x289/0x3f0 drm_gem_vram_init drm_gem_vram_create+0x775/0x990 drm_gem_vram_fill_create_dumb drm_gem_vram_driver_dumb_create+0x238/0x590 drm_mode_create_dumb drm_mode_create_dumb_ioctl+0x41d/0x450 drm_ioctl_kernel+0x5a4/0x710 drm_ioctl+0xc6f/0x1240 vfs_ioctl ksys_ioctl __do_sys_ioctl __se_sys_ioctl+0x2e9/0x410 __x64_sys_ioctl+0x4a/0x70 do_syscall_64+0xb8/0x160 entry_SYSCALL_64_after_hwframe+0x44/0xa9
If ttm_bo_init() fails, the "gbo" will be freed by ttm_buffer_object_destroy() in ttm_bo_init(). But then drm_gem_vram_create() and drm_gem_vram_init() will free "gbo" again.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +13 -11
@@ -73,6 +73,10 @@ static void drm_gem_vram_placement(struc } } +/* +* Note that on error, drm_gem_vram_init will free the buffer object. +*/ + static int drm_gem_vram_init(struct drm_device *dev, struct ttm_bo_device *bdev, struct drm_gem_vram_object *gbo,
@@ -86,8 +90,10 @@ static int drm_gem_vram_init(struct drm_ gbo->bo.base.funcs = &drm_gem_vram_object_funcs; ret =drm_gem_object_init (dev, &gbo->bo.base, size); -if (ret) +if (ret) { +kfree (gbo);return ret; + } acc_size =ttm_bo_dma_acc_size (bdev, size,sizeof (*gbo));
@@ -98,13 +104,13 @@ static int drm_gem_vram_init(struct drm_ &gbo->placement, pg_align, interruptible, acc_size, NULL, NULL, ttm_buffer_object_destroy);if (ret) - goto err_drm_gem_object_release; +/* +* A failing ttm_bo_init will call ttm_buffer_object_destroy +* to release gbo->bo.base and kfree gbo. +*/ +return ret;return 0 ; - -err_drm_gem_object_release: -drm_gem_object_release (&gbo->bo.base); -return ret; }/**
@@ -134,13 +140,9 @@ struct drm_gem_vram_object *drm_gem_vram ret =drm_gem_vram_init (dev, bdev, gbo, size, pg_align, interruptible);if (ret <0 ) - goto err_kfree; +return ERR_PTR (ret);return gbo; - -err_kfree: -kfree (gbo); -return ERR_PTR (ret); }EXPORT_SYMBOL (drm_gem_vram_create);
Greg Kroah-Hartman
maintainerPATCH 239/367 net/ipv6: SKB symmetric hash should incorporate transport ports
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quan Tian <[email protected]>
commit a5e2151ff9d5852d0ababbbcaeebd9646af9c8d9 upstream.
__skb_get_hash_symmetric() was added to compute a symmetric hash over the protocol, addresses and transport ports, by commit eb70db875671 ("packet: Use symmetric hash for PACKET_FANOUT_HASH."). It uses flow_keys_dissector_symmetric_keys as the flow_dissector to incorporate IPv4 addresses, IPv6 addresses and ports. However, it should not specify the flag as FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL, which stops further dissection when an IPv6 flow label is encountered, making transport ports not being incorporated in such case.
As a consequence, the symmetric hash is based on 5-tuple for IPv4 but 3-tuple for IPv6 when flow label is present. It caused a few problems, e.g. when nft symhash and openvswitch l4_sym rely on the symmetric hash to perform load balancing as different L4 flows between two given IPv6 addresses would always get the same symmetric hash, leading to uneven traffic distribution.
Removing the use of FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL makes sure the symmetric hash is based on 5-tuple for both IPv4 and IPv6 consistently.
--- net/core/flow_dissector.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/core/flow_dissector.c +1 -2
@@ -1564,8 +1564,7 @@ u32 __skb_get_hash_symmetric(const strucmemset (&keys,0 ,sizeof (keys));__skb_flow_dissect (NULL , skb, &flow_keys_dissector_symmetric, - &keys,NULL ,0 ,0 ,0 , -FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL ); + &keys,NULL ,0 ,0 ,0 ,0 );return __flow_hash_from_keys (&keys, &hashrnd); }
Greg Kroah-Hartman
maintainerPATCH 240/367 scsi: qla2xxx: fix inconsistent TMF timeout
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 009e7fe4a1ed52276b332842a6b6e23b07200f2d upstream.
Different behavior were experienced of session being torn down vs not when TMF is timed out. When FW detects the time out, the session is torn down. When driver detects the time out, the session is not torn down.
Allow TMF error to return to upper layer without session tear down.
--- drivers/scsi/qla2xxx/qla_isr.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/qla2xxx/qla_isr.c +0 -1
@@ -2711,7 +2711,6 @@ check_scsi_status:case CS_PORT_BUSY :case CS_INCOMPLETE :case CS_PORT_UNAVAILABLE : -case CS_TIMEOUT :case CS_RESET :/*
Greg Kroah-Hartman
maintainerPATCH 241/367 scsi: qla2xxx: Fix erroneous link up failure
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 5b51f35d127e7bef55fa869d2465e2bca4636454 upstream.
Link up failure occurred where driver failed to see certain events from FW indicating link up (AEN 8011) and fabric login completion (AEN 8014). Without these 2 events, driver would not proceed forward to scan the fabric. The cause of this is due to delay in the receive of interrupt for Mailbox 60 that causes qla to set the fw_started flag late. The late setting of this flag causes other interrupts to be dropped. These dropped interrupts happen to be the link up (AEN 8011) and fabric login completion (AEN 8014).
Set fw_started flag early to prevent interrupts being dropped.
--- drivers/scsi/qla2xxx/qla_init.c | 3 ++- drivers/scsi/qla2xxx/qla_isr.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -1
@@ -4176,15 +4176,16 @@ qla2x00_init_rings(scsi_qla_host_t *vha) (ha->flags.fawwpn_enabled) ? "enabled" : "disabled"); } +QLA_FW_STARTED (ha); rval =qla2x00_init_firmware (vha, ha->init_cb_size); next_check:if (rval) { +QLA_FW_STOPPED (ha);ql_log (ql_log_fatal, vha,0x00d2 ,"Init Firmware **** FAILED ****.\n" ); }else {ql_dbg (ql_dbg_init, vha,0x00d3 ,"Init Firmware -- success.\n" ); -QLA_FW_STARTED (ha); vha->u_ql2xexchoffld = vha->u_ql2xiniexchg =0 ; }
drivers/scsi/qla2xxx/qla_isr.c +5 -1
@@ -639,8 +639,12 @@ qla2x00_async_event(scsi_qla_host_t *vhaunsigned long flags;fc_port_t *fcport =NULL ; -if (!vha->hw->flags.fw_started) +if (!vha->hw->flags.fw_started) { +ql_log (ql_log_warn, vha,0x50ff , +"Dropping AEN - %04x %04x %04x %04x.\n" , + mb[0 ], mb[1 ], mb[2 ], mb[3 ]);return ; + }/* Setup to process RIO completion. */ handle_cnt =0 ;
Greg Kroah-Hartman
maintainerPATCH 242/367 scsi: qla2xxx: Turn off noisy message log
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 8ebaa45163a3fedc885c1dc7d43ea987a2f00a06 upstream.
Some consider noisy log as test failure. Turn off noisy message log.
--- drivers/scsi/qla2xxx/qla_nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_nvme.c +1 -1
@@ -577,7 +577,7 @@ static int qla_nvme_post_cmd(struct nvme rval =qla2x00_start_nvme_mq (sp);if (rval !=QLA_SUCCESS ) { -ql_log (ql_log_warn, vha,0x212d , +ql_dbg (ql_dbg_io + ql_dbg_verbose, vha,0x212d ,"qla2x00_start_nvme_mq failed = %d\n" , rval); sp->priv =NULL ; priv->sp =NULL ;
Greg Kroah-Hartman
maintainerPATCH 243/367 scsi: qla2xxx: Remove unsupported ql2xenabledif option
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manish Rangankar <[email protected]>
commit e9105c4b7a9208a21a9bda133707624f12ddabc2 upstream.
User accidently passed module parameter ql2xenabledif=1 which is unsupported. However, driver still initialized which lead to guard tag errors during device discovery.
Remove unsupported ql2xenabledif=1 option and validate the user input.
--- drivers/scsi/qla2xxx/qla_attr.c | 2 -- drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 9 +++++++-- 3 files changed, 8 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +0 -2
@@ -2864,8 +2864,6 @@ qla24xx_vport_create(struct fc_vport *fc vha->flags.difdix_supported =1 ;ql_dbg (ql_dbg_user, vha,0x7082 ,"Registered for DIF/DIX type 1 and 3 protection.\n" ); -if (ql2xenabledif ==1 ) - prot =SHOST_DIX_TYPE0_PROTECTION ;scsi_host_set_prot (vha->host, prot |SHOST_DIF_TYPE1_PROTECTION | SHOST_DIF_TYPE2_PROTECTION
drivers/scsi/qla2xxx/qla_dbg.c +1 -1
@@ -22,7 +22,7 @@* | Queue Command and IO tracing | 0x3074 | 0x300b | * | | | 0x3027-0x3028 | * | | | 0x303d-0x3041 | -* | | | 0x302d,0x3033 | +* | | | 0x302e,0x3033 | * | | | 0x3036,0x3038 | * | | | 0x303a | * | DPC Thread | 0x4023 | 0x4002,0x4013 |
drivers/scsi/qla2xxx/qla_os.c +7 -2
@@ -3112,6 +3112,13 @@ qla2x00_probe_one(struct pci_dev *pdev, host->max_id = ha->max_fibre_devices; host->cmd_per_lun =3 ; host->unique_id = host->host_no; + +if (ql2xenabledif && ql2xenabledif !=2 ) { +ql_log (ql_log_warn, base_vha,0x302d , +"Invalid value for ql2xenabledif, resetting it to default (2)\n" ); + ql2xenabledif =2 ; + } +if (IS_T10_PI_CAPABLE (ha) && ql2xenabledif) host->max_cmd_len =32 ;else
@@ -3343,8 +3350,6 @@ skip_dpc: base_vha->flags.difdix_supported =1 ;ql_dbg (ql_dbg_init, base_vha,0x00f1 ,"Registering for DIF/DIX type 1 and 3 protection.\n" ); -if (ql2xenabledif ==1 ) - prot =SHOST_DIX_TYPE0_PROTECTION ;if (ql2xprotmask)scsi_host_set_prot (host, ql2xprotmask);else
Greg Kroah-Hartman
maintainerPATCH 244/367 fbdev/ep93xx-fb: Do not assign to struct fb_info.dev
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit f90a0e5265b60cdd3c77990e8105f79aa2fac994 upstream.
Do not assing the Linux device to struct fb_info.dev. The call to register_framebuffer() initializes the field to the fbdev device. Drivers should not override its value.
Fixes a bug where the driver incorrectly decreases the hardware device's reference counter and leaks the fbdev device.
v2:
* add Fixes tag (Dan)
--- drivers/video/fbdev/ep93xx-fb.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/fbdev/ep93xx-fb.c +0 -1
@@ -474,7 +474,6 @@ static int ep93xxfb_probe(struct platforif (!info)return -ENOMEM ; - info->dev = &pdev->dev;platform_set_drvdata (pdev, info); fbi = info->par; fbi->mach_info = mach_info;
Greg Kroah-Hartman
maintainerPATCH 245/367 drm/ast: Fix DRAM init on AST2200
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit 4cfe75f0f14f044dae66ad0e6eea812d038465d9 upstream.
Fix the test for the AST2200 in the DRAM initialization. The value in ast->chip has to be compared against an enum constant instead of a numerical value.
This bug got introduced when the driver was first imported into the kernel.
--- drivers/gpu/drm/ast/ast_post.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_post.c +1 -1
@@ -294,7 +294,7 @@ static void ast_init_dram_reg(struct drm ; }while (ast_read32 (ast,0x10100 ) !=0xa8 ); }else {/* AST2100/1100 */ -if (ast->chip ==AST2100 || ast->chip ==2200 ) +if (ast->chip ==AST2100 || ast->chip ==AST2200 ) dram_reg_info = ast2100_dram_table_data;else dram_reg_info = ast1100_dram_table_data;
Greg Kroah-Hartman
maintainerPATCH 246/367 lib/test_meminit: allocate pages up to order MAX_ORDER
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Donnellan <[email protected]>
commit efb78fa86e95832b78ca0ba60f3706788a818938 upstream.
test_pages() tests the page allocator by calling alloc_pages() with different orders up to order 10.
However, different architectures and platforms support different maximum contiguous allocation sizes. The default maximum allocation order (MAX_ORDER) is 10, but architectures can use CONFIG_ARCH_FORCE_MAX_ORDER to override this. On platforms where this is less than 10, test_meminit() will blow up with a WARN(). This is expected, so let's not do that.
Replace the hardcoded "10" with the MAX_ORDER macro so that we test allocations up to the expected platform limit.
--- lib/test_meminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/test_meminit.c +1 -1
@@ -86,7 +86,7 @@ static int __init test_pages(int *total_int failures =0 , num_tests =0 ;int i; -for (i =0 ; i <10 ; i++) +for (i =0 ; i <=MAX_ORDER ; i++) num_tests +=do_alloc_pages_order (i, &failures);REPORT_FAILURES_IN_FN ();
Greg Kroah-Hartman
maintainerPATCH 247/367 parisc: led: Fix LAN receive and transmit LEDs
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 4db89524b084f712a887256391fc19d9f66c8e55 upstream.
Fix the LAN receive and LAN transmit LEDs, which where swapped up to now.
--- arch/parisc/include/asm/led.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/parisc/include/asm/led.h +2 -2
@@ -11,8 +11,8 @@#define LED1 0x02#define LED0 0x01/* bottom (or furthest left) LED */ -#define LED_LAN_TX LED0/* for LAN transmit activity */ -#define LED_LAN_RCV LED1/* for LAN receive activity */ +#define LED_LAN_RCV LED0/* for LAN receive activity */ +#define LED_LAN_TX LED1/* for LAN transmit activity */ #define LED_DISK_IO LED2/* for disk activity */ #define LED_HEARTBEAT LED3/* heartbeat */
Greg Kroah-Hartman
maintainerPATCH 248/367 parisc: led: Reduce CPU overhead for disk & lan LED computation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 358ad816e52d4253b38c2f312e6b1cbd89e0dbf7 upstream.
Older PA-RISC machines have LEDs which show the disk- and LAN-activity. The computation is done in software and takes quite some time, e.g. on a J6500 this may take up to 60% time of one CPU if the machine is loaded via network traffic.
Since most people don't care about the LEDs, start with LEDs disabled and just show a CPU heartbeat LED. The disk and LAN LEDs can be turned on manually via /proc/pdc/led.
--- drivers/parisc/led.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/parisc/led.c +2 -2
@@ -56,8 +56,8 @@static int led_type__read_mostly =-1 ;static unsigned char lastleds;/* LED state from most recent update */ static unsigned int led_heartbeat__read_mostly =1 ; -static unsigned int led_diskio__read_mostly =1 ; -static unsigned int led_lanrxtx__read_mostly =1 ; +static unsigned int led_diskio__read_mostly ; +static unsigned int led_lanrxtx__read_mostly ;static char lcd_text[32 ]__read_mostly ;static char lcd_text_default[32 ]__read_mostly ;static int lcd_no_led_support__read_mostly =0 ;/* KittyHawk doesn't support LED on its LCD */
Greg Kroah-Hartman
maintainerPATCH 249/367 clk: qcom: gcc-mdm9615: use proper parent for pll0_vote clock
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
commit 1583694bb4eaf186f17131dbc1b83d6057d2749b upstream.
The pll0_vote clock definitely should have pll0 as a parent (instead of pll8).
--- drivers/clk/qcom/gcc-mdm9615.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-mdm9615.c +1 -1
@@ -58,7 +58,7 @@ static struct clk_regmap pll0_vote = { .enable_mask = BIT(0), .hw.init = &(struct clk_init_data ){ .name ="pll0_vote" , - .parent_names = (const char *[]){"pll8" }, + .parent_names = (const char *[]){"pll0" }, .num_parents =1 , .ops = &clk_pll_vote_ops, },
Greg Kroah-Hartman
maintainerPATCH 250/367 soc: qcom: qmi_encdec: Restrict string length in decode
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Lew <[email protected]>
commit 8d207400fd6b79c92aeb2f33bb79f62dff904ea2 upstream.
The QMI TLV value for strings in a lot of qmi element info structures account for null terminated strings with MAX_LEN + 1. If a string is actually MAX_LEN + 1 length, this will cause an out of bounds access when the NULL character is appended in decoding.
--- drivers/soc/qcom/qmi_encdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/qmi_encdec.c +2 -2
@@ -534,8 +534,8 @@ static int qmi_decode_string_elem(struct decoded_bytes += rc; } -if (string_len > temp_ei->elem_len) { -pr_err ("%s: String len %d > Max Len %d\n" , +if (string_len >= temp_ei->elem_len) { +pr_err ("%s: String len %d >= Max Len %d\n" , __func__, string_len, temp_ei->elem_len);return -ETOOSMALL ; }else if (string_len > tlv_len) {
Greg Kroah-Hartman
maintainerPATCH 251/367 NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 96562c45af5c31b89a197af28f79bfa838fb8391 upstream.
It is an almost improbable error case but when page allocating loop in nfs4_get_device_info() fails then we should only free the already allocated pages, as __free_page() can't deal with NULL arguments.
Found by Linux Verification Center (linuxtesting.org).
--- fs/nfs/pnfs_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs_dev.c +1 -1
@@ -152,7 +152,7 @@ nfs4_get_device_info(struct nfs_server *set_bit (NFS_DEVICEID_NOCACHE , &d->flags); out_free_pages: -for (i =0 ; i < max_pages; i++) +while (--i >=0 )__free_page (pages[i]);kfree (pages); out_free_pdev:
Greg Kroah-Hartman
maintainerPATCH 252/367 kconfig: fix possible buffer overflow
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Meskhidze <[email protected]>
[ Upstream commit a3b7039bb2b22fcd2ad20d59c00ed4e606ce3754 ]
Buffer 'new_argv' is accessed without bound check after accessing with bound check via 'new_argc' index.
--- scripts/kconfig/preprocess.c | 3 +++ 1 file changed, 3 insertions(+)
scripts/kconfig/preprocess.c +3 -0
@@ -396,6 +396,9 @@ static char *eval_clause(const char *str, size_t len, int argc, char *argv[]) p++; } + +if (new_argc >=FUNCTION_MAX_ARGS ) +pperror ("too many function arguments" ); new_argv[new_argc++] = prev;/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 253/367 perf annotate bpf: Dont enclose non-debug code with an assert()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 979e9c9fc9c2a761303585e07fe2699bdd88182f ]
In 616b14b47a86d880 ("perf build: Conditionally define NDEBUG") we started using NDEBUG=1 when DEBUG=1 isn't present, so code that is enclosed with assert() is not called.
In dd317df072071903 ("perf build: Make binutil libraries opt in") we stopped linking against binutils-devel, for licensing reasons.
Recently people asked me why annotation of BPF programs wasn't working, i.e. this:
$ perf annotate bpf_prog_5280546344e3f45c_kfree_skb
was returning:
case SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF:
scnprintf(buf, buflen, "Please link with binutils's libopcode to enable BPF annotation");
This was on a fedora rpm, so its new enough that I had to try to test by rebuilding using BUILD_NONDISTRO=1, only to get it segfaulting on me.
This combination made this libopcode function not to be called:
assert(bfd_check_format(bfdf, bfd_object));
Changing it to:
if (!bfd_check_format(bfdf, bfd_object)) abort();
Made it work, looking at this "check" function made me realize it changes the 'bfdf' internal state, i.e. we better call it.
So stop using assert() on it, just call it and abort if it fails.
Probably it is better to propagate the error, etc, but it seems it is unlikely to fail from the usage done so far and we really need to stop using libopcodes, so do the quick fix above and move on.
With it we have BPF annotation back working when built with BUILD_NONDISTRO=1:
⬢[acme@toolbox perf-tools-next]$ perf annotate --stdio2 bpf_prog_5280546344e3f45c_kfree_skb | head
No kallsyms or vmlinux with build-id 939bc71a1a51cdc434e60af93c7e734f7d5c0e7e was found
Samples: 12 of event 'cpu-clock:ppp', 4000 Hz, Event count (approx.): 3000000, [percent: local period]
bpf_prog_5280546344e3f45c_kfree_skb() bpf_prog_5280546344e3f45c_kfree_skb
Percent int kfree_skb(struct trace_event_raw_kfree_skb *args) {
nop
33.33 xchg %ax,%ax
push %rbp
mov %rsp,%rbp
sub $0x180,%rsp
push %rbx
push %r13
⬢[acme@toolbox perf-tools-next]$--- tools/perf/util/annotate.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +7 -3
@@ -1741,8 +1741,11 @@ static int symbol__disassemble_bpf(struct symbol *sym,perf_exe (tpath,sizeof (tpath)); bfdf =bfd_openr (tpath,NULL ); -assert (bfdf); -assert (bfd_check_format (bfdf, bfd_object)); +if (bfdf ==NULL ) +abort (); + +if (!bfd_check_format (bfdf, bfd_object)) +abort (); s =open_memstream (&buf, &buf_size);if (!s) {
@@ -1790,7 +1793,8 @@ static int symbol__disassemble_bpf(struct symbol *sym,#else disassemble =disassembler (bfdf);#endif -assert (disassemble); +if (disassemble ==NULL ) +abort ();fflush (s); do {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 254/367 x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 5df8ecfe3632d5879d1f154f7aa8de441b5d1c89 ]
Drop the explicit check on the extended CPUID level in cpu_has_svm(), the kernel's cached CPUID info will leave the entire SVM leaf unset if said leaf is not supported by hardware. Prior to using cached information, the check was needed to avoid false positives due to Intel's rather crazy CPUID behavior of returning the values of the maximum supported leaf if the specified leaf is unsupported.
--- arch/x86/include/asm/virtext.h | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/include/asm/virtext.h +0 -6
@@ -95,12 +95,6 @@ static inline int cpu_has_svm(const char **msg)return 0 ; } -if (boot_cpu_data.extended_cpuid_level <SVM_CPUID_FUNC ) { -if (msg) - *msg ="can't execute cpuid_8000000a" ; -return 0 ; - } -if (!boot_cpu_has (X86_FEATURE_SVM )) {if (msg) *msg ="svm not available" ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 255/367 perf top: Dont pass an ERR_PTR() directly to perf_session__delete()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit ef23cb593304bde0cc046fd4cc83ae7ea2e24f16 ]
While debugging a segfault on 'perf lock contention' without an available perf.data file I noticed that it was basically calling:
perf_session__delete(ERR_PTR(-1))
Resulting in:
(gdb) run lock contention
Starting program: /root/bin/perf lock contention
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1". failed to open perf.data: No such file or directory (try 'perf record' first) Initializing perf session failed
Program received signal SIGSEGV, Segmentation fault.
0x00000000005e7515 in auxtrace__free (session=0xffffffffffffffff) at util/auxtrace.c:2858
2858 if (!session->auxtrace)
(gdb) p session
$1 = (struct perf_session *) 0xffffffffffffffff
(gdb) bt
#0 0x00000000005e7515 in auxtrace__free (session=0xffffffffffffffff) at util/auxtrace.c:2858 #1 0x000000000057bb4d in perf_session__delete (session=0xffffffffffffffff) at util/session.c:300 #2 0x000000000047c421 in __cmd_contention (argc=0, argv=0x7fffffffe200) at builtin-lock.c:2161 #3 0x000000000047dc95 in cmd_lock (argc=0, argv=0x7fffffffe200) at builtin-lock.c:2604 #4 0x0000000000501466 in run_builtin (p=0xe597a8 <commands+552>, argc=2, argv=0x7fffffffe200) at perf.c:322 #5 0x00000000005016d5 in handle_internal_command (argc=2, argv=0x7fffffffe200) at perf.c:375 #6 0x0000000000501824 in run_argv (argcp=0x7fffffffe02c, argv=0x7fffffffe020) at perf.c:419 #7 0x0000000000501b11 in main (argc=2, argv=0x7fffffffe200) at perf.c:535
(gdb)
So just set it to NULL after using PTR_ERR(session) to decode the error as perf_session__delete(NULL) is supported.
The same problem was found in 'perf top' after an audit of all perf_session__new() failure handling.
--- tools/perf/builtin-top.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/builtin-top.c +1 -0
@@ -1679,6 +1679,7 @@ int cmd_top(int argc, const char **argv) top.session =perf_session__new (NULL , false,NULL );if (IS_ERR (top.session)) { status =PTR_ERR (top.session); + top.session =NULL ; goto out_delete_evlist; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 256/367 watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raag Jadav <[email protected]>
[ Upstream commit cf38e7691c85f1b09973b22a0b89bf1e1228d2f9 ]
When built with CONFIG_INTEL_MID_WATCHDOG=m, currently the driver needs to be loaded manually, for the lack of module alias. This causes unintended resets in cases where watchdog timer is set-up by bootloader and the driver is not explicitly loaded. Add MODULE_ALIAS() to load the driver automatically at boot and avoid this issue.
--- drivers/watchdog/intel-mid_wdt.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/intel-mid_wdt.c +1 -0
@@ -181,3 +181,4 @@ module_platform_driver(mid_wdt_driver);MODULE_AUTHOR ("David Cohen <[email protected]>" );MODULE_DESCRIPTION ("Watchdog Driver for Intel MID platform" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:intel_mid_wdt" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 257/367 pwm: lpc32xx: Remove handling of PWM channels
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 4aae44f65827f0213a7361cf9c32cfe06114473f ]
Because LPC32xx PWM controllers have only a single output which is registered as the only PWM device/channel per controller, it is known in advance that pwm->hwpwm value is always 0. On basis of this fact simplify the code by removing operations with pwm->hwpwm, there is no controls which require channel number as input.
Even though I wasn't aware at the time when I forward ported that patch, this fixes a null pointer dereference as lpc32xx->chip.pwms is NULL before devm_pwmchip_add() is called.
--- drivers/pwm/pwm-lpc32xx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pwm/pwm-lpc32xx.c +8 -8
@@ -51,10 +51,10 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,if (duty_cycles >255 ) duty_cycles =255 ; - val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base); val &= ~0xFFFF ; val |= (period_cycles <<8 ) | duty_cycles; -writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); +writel (val, lpc32xx->base);return 0 ; }
@@ -69,9 +69,9 @@ static int lpc32xx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)if (ret)return ret; - val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base); val |=PWM_ENABLE ; -writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); +writel (val, lpc32xx->base);return 0 ; }
@@ -81,9 +81,9 @@ static void lpc32xx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip);u32 val; - val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base); val &= ~PWM_ENABLE ; -writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); +writel (val, lpc32xx->base);clk_disable_unprepare (lpc32xx->clk); }
@@ -121,9 +121,9 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev) lpc32xx->chip.base =-1 ;/* If PWM is disabled, configure the output to the default value */ - val =readl (lpc32xx->base + (lpc32xx->chip.pwms[0 ].hwpwm <<2 )); + val =readl (lpc32xx->base); val &= ~PWM_PIN_LEVEL ; -writel (val, lpc32xx->base + (lpc32xx->chip.pwms[0 ].hwpwm <<2 )); +writel (val, lpc32xx->base); ret =pwmchip_add (&lpc32xx->chip);if (ret <0 ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 258/367 sctp: annotate data-races around sk->sk_wmem_queued
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit dc9511dd6f37fe803f6b15b61b030728d7057417 ]
sk->sk_wmem_queued can be read locklessly from sctp_poll()
Use sk_wmem_queued_add() when the field is changed, and add READ_ONCE() annotations in sctp_writeable() and sctp_assocs_seq_show()
syzbot reported:
BUG: KCSAN: data-race in sctp_poll / sctp_wfree
read-write to 0xffff888149d77810 of 4 bytes by interrupt on cpu 0:
sctp_wfree+0x170/0x4a0 net/sctp/socket.c:9147 skb_release_head_state+0xb7/0x1a0 net/core/skbuff.c:988 skb_release_all net/core/skbuff.c:1000 [inline] __kfree_skb+0x16/0x140 net/core/skbuff.c:1016 consume_skb+0x57/0x180 net/core/skbuff.c:1232 sctp_chunk_destroy net/sctp/sm_make_chunk.c:1503 [inline] sctp_chunk_put+0xcd/0x130 net/sctp/sm_make_chunk.c:1530 sctp_datamsg_put+0x29a/0x300 net/sctp/chunk.c:128 sctp_chunk_free+0x34/0x50 net/sctp/sm_make_chunk.c:1515 sctp_outq_sack+0xafa/0xd70 net/sctp/outqueue.c:1381 sctp_cmd_process_sack net/sctp/sm_sideeffect.c:834 [inline] sctp_cmd_interpreter net/sctp/sm_sideeffect.c:1366 [inline] sctp_side_effects net/sctp/sm_sideeffect.c:1198 [inline] sctp_do_sm+0x12c7/0x31b0 net/sctp/sm_sideeffect.c:1169 sctp_assoc_bh_rcv+0x2b2/0x430 net/sctp/associola.c:1051 sctp_inq_push+0x108/0x120 net/sctp/inqueue.c:80 sctp_rcv+0x116e/0x1340 net/sctp/input.c:243 sctp6_rcv+0x25/0x40 net/sctp/ipv6.c:1120 ip6_protocol_deliver_rcu+0x92f/0xf30 net/ipv6/ip6_input.c:437 ip6_input_finish net/ipv6/ip6_input.c:482 [inline] NF_HOOK include/linux/netfilter.h:303 [inline] ip6_input+0xbd/0x1b0 net/ipv6/ip6_input.c:491 dst_input include/net/dst.h:468 [inline] ip6_rcv_finish+0x1e2/0x2e0 net/ipv6/ip6_input.c:79 NF_HOOK include/linux/netfilter.h:303 [inline] ipv6_rcv+0x74/0x150 net/ipv6/ip6_input.c:309 __netif_receive_skb_one_core net/core/dev.c:5452 [inline] __netif_receive_skb+0x90/0x1b0 net/core/dev.c:5566 process_backlog+0x21f/0x380 net/core/dev.c:5894 __napi_poll+0x60/0x3b0 net/core/dev.c:6460 napi_poll net/core/dev.c:6527 [inline] net_rx_action+0x32b/0x750 net/core/dev.c:6660 __do_softirq+0xc1/0x265 kernel/softirq.c:553 run_ksoftirqd+0x17/0x20 kernel/softirq.c:921 smpboot_thread_fn+0x30a/0x4a0 kernel/smpboot.c:164 kthread+0x1d7/0x210 kernel/kthread.c:389 ret_from_fork+0x2e/0x40 arch/x86/kernel/process.c:145 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:304
read to 0xffff888149d77810 of 4 bytes by task 17828 on cpu 1:
sctp_writeable net/sctp/socket.c:9304 [inline] sctp_poll+0x265/0x410 net/sctp/socket.c:8671 sock_poll+0x253/0x270 net/socket.c:1374 vfs_poll include/linux/poll.h:88 [inline] do_pollfd fs/select.c:873 [inline] do_poll fs/select.c:921 [inline] do_sys_poll+0x636/0xc00 fs/select.c:1015 __do_sys_ppoll fs/select.c:1121 [inline] __se_sys_ppoll+0x1af/0x1f0 fs/select.c:1101 __x64_sys_ppoll+0x67/0x80 fs/select.c:1101 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0x00019e80 -> 0x0000cc80
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 17828 Comm: syz-executor.1 Not tainted 6.5.0-rc7-syzkaller-00185-g28f20a19294d #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023
--- net/sctp/proc.c | 2 +- net/sctp/socket.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
net/sctp/proc.c +1 -1
@@ -284,7 +284,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) assoc->init_retries, assoc->shutdown_retries, assoc->rtx_data_chunks,refcount_read (&sk->sk_wmem_alloc), - sk->sk_wmem_queued, +READ_ONCE (sk->sk_wmem_queued), sk->sk_sndbuf, sk->sk_rcvbuf);seq_printf (seq,"\n" );
net/sctp/socket.c +5 -5
@@ -68,7 +68,7 @@#include <net/sctp/stream_sched.h> /* Forward declarations for internal helper functions. */ -static bool sctp_writeable (struct sock *sk); +static bool sctp_writeable (const struct sock *sk);static void sctp_wfree (struct sk_buff *skb);static int sctp_wait_for_sndbuf (struct sctp_association *asoc,long *timeo_p,size_t msg_len);
@@ -138,7 +138,7 @@ static inline void sctp_set_owner_w(struct sctp_chunk *chunk)refcount_add (sizeof (struct sctp_chunk ), &sk->sk_wmem_alloc); asoc->sndbuf_used += chunk->skb->truesize +sizeof (struct sctp_chunk ); - sk->sk_wmem_queued += chunk->skb->truesize +sizeof (struct sctp_chunk ); +sk_wmem_queued_add (sk, chunk->skb->truesize +sizeof (struct sctp_chunk ));sk_mem_charge (sk, chunk->skb->truesize); }
@@ -8997,7 +8997,7 @@ static void sctp_wfree(struct sk_buff *skb)struct sock *sk = asoc->base.sk;sk_mem_uncharge (sk, skb->truesize); - sk->sk_wmem_queued -= skb->truesize +sizeof (struct sctp_chunk ); +sk_wmem_queued_add (sk, -(skb->truesize +sizeof (struct sctp_chunk ))); asoc->sndbuf_used -= skb->truesize +sizeof (struct sctp_chunk );WARN_ON (refcount_sub_and_test (sizeof (struct sctp_chunk ), &sk->sk_wmem_alloc));
@@ -9152,9 +9152,9 @@ void sctp_write_space(struct sock *sk)* UDP-style sockets or TCP-style sockets, this code should work. * - Daisy */ -static bool sctp_writeable (struct sock *sk) +static bool sctp_writeable (const struct sock *sk) { -return sk->sk_sndbuf > sk->sk_wmem_queued; +return READ_ONCE (sk->sk_sndbuf) >READ_ONCE (sk->sk_wmem_queued); }/* Wait for an association to go into ESTABLISHED state. If timeout is 0,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 259/367 ipv4: annotate data-races around fi->fib_dead
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit fce92af1c29d90184dfec638b5738831097d66e9 ]
syzbot complained about a data-race in fib_table_lookup() [1]
Add appropriate annotations to document it.
[1]
BUG: KCSAN: data-race in fib_release_info / fib_table_lookup
write to 0xffff888150f31744 of 1 bytes by task 1189 on cpu 0:
fib_release_info+0x3a0/0x460 net/ipv4/fib_semantics.c:281 fib_table_delete+0x8d2/0x900 net/ipv4/fib_trie.c:1777 fib_magic+0x1c1/0x1f0 net/ipv4/fib_frontend.c:1106 fib_del_ifaddr+0x8cf/0xa60 net/ipv4/fib_frontend.c:1317 fib_inetaddr_event+0x77/0x200 net/ipv4/fib_frontend.c:1448 notifier_call_chain kernel/notifier.c:93 [inline] blocking_notifier_call_chain+0x90/0x200 kernel/notifier.c:388 __inet_del_ifa+0x4df/0x800 net/ipv4/devinet.c:432 inet_del_ifa net/ipv4/devinet.c:469 [inline] inetdev_destroy net/ipv4/devinet.c:322 [inline] inetdev_event+0x553/0xaf0 net/ipv4/devinet.c:1606 notifier_call_chain kernel/notifier.c:93 [inline] raw_notifier_call_chain+0x6b/0x1c0 kernel/notifier.c:461 call_netdevice_notifiers_info net/core/dev.c:1962 [inline] call_netdevice_notifiers_mtu+0xd2/0x130 net/core/dev.c:2037 dev_set_mtu_ext+0x30b/0x3e0 net/core/dev.c:8673 do_setlink+0x5be/0x2430 net/core/rtnetlink.c:2837 rtnl_setlink+0x255/0x300 net/core/rtnetlink.c:3177 rtnetlink_rcv_msg+0x807/0x8c0 net/core/rtnetlink.c:6445 netlink_rcv_skb+0x126/0x220 net/netlink/af_netlink.c:2549 rtnetlink_rcv+0x1c/0x20 net/core/rtnetlink.c:6463 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x56f/0x640 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x665/0x770 net/netlink/af_netlink.c:1914 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg net/socket.c:748 [inline] sock_write_iter+0x1aa/0x230 net/socket.c:1129 do_iter_write+0x4b4/0x7b0 fs/read_write.c:860 vfs_writev+0x1a8/0x320 fs/read_write.c:933 do_writev+0xf8/0x220 fs/read_write.c:976 __do_sys_writev fs/read_write.c:1049 [inline] __se_sys_writev fs/read_write.c:1046 [inline] __x64_sys_writev+0x45/0x50 fs/read_write.c:1046 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
read to 0xffff888150f31744 of 1 bytes by task 21839 on cpu 1:
fib_table_lookup+0x2bf/0xd50 net/ipv4/fib_trie.c:1585 fib_lookup include/net/ip_fib.h:383 [inline] ip_route_output_key_hash_rcu+0x38c/0x12c0 net/ipv4/route.c:2751 ip_route_output_key_hash net/ipv4/route.c:2641 [inline] __ip_route_output_key include/net/route.h:134 [inline] ip_route_output_flow+0xa6/0x150 net/ipv4/route.c:2869 send4+0x1e7/0x500 drivers/net/wireguard/socket.c:61 wg_socket_send_skb_to_peer+0x94/0x130 drivers/net/wireguard/socket.c:175 wg_socket_send_buffer_to_peer+0xd6/0x100 drivers/net/wireguard/socket.c:200 wg_packet_send_handshake_initiation drivers/net/wireguard/send.c:40 [inline] wg_packet_handshake_send_worker+0x10c/0x150 drivers/net/wireguard/send.c:51 process_one_work+0x434/0x860 kernel/workqueue.c:2600 worker_thread+0x5f2/0xa10 kernel/workqueue.c:2751 kthread+0x1d7/0x210 kernel/kthread.c:389 ret_from_fork+0x2e/0x40 arch/x86/kernel/process.c:145 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:304
value changed: 0x00 -> 0x01
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 21839 Comm: kworker/u4:18 Tainted: G W 6.5.0-syzkaller #0
--- net/ipv4/fib_semantics.c | 5 ++++- net/ipv4/fib_trie.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/fib_semantics.c +4 -1
@@ -275,7 +275,8 @@ void fib_release_info(struct fib_info *fi)hlist_del (&nexthop_nh->nh_hash); } endfor_nexthops(fi) } - fi->fib_dead =1 ; +/* Paired with READ_ONCE() from fib_table_lookup() */ +WRITE_ONCE (fi->fib_dead,1 );fib_info_put (fi); }spin_unlock_bh (&fib_info_lock);
@@ -1586,6 +1587,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, link_it: ofi =fib_find_info (fi);if (ofi) { +/* fib_table_lookup() should not see @fi yet. */ fi->fib_dead =1 ;free_fib_info (fi); ofi->fib_treeref++;
@@ -1623,6 +1625,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, failure:if (fi) { +/* fib_table_lookup() should not see @fi yet. */ fi->fib_dead =1 ;free_fib_info (fi); }
net/ipv4/fib_trie.c +2 -1
@@ -1448,7 +1448,8 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp, }if (fa->fa_tos && fa->fa_tos != flp->flowi4_tos)continue ; -if (fi->fib_dead) +/* Paired with WRITE_ONCE() in fib_release_info() */ +if (READ_ONCE (fi->fib_dead))continue ;if (fa->fa_info->fib_scope < flp->flowi4_scope)continue ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 260/367 net: read sk->sk_family once in sk_mc_loop()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit a3e0fdf71bbe031de845e8e08ed7fba49f9c702c ]
syzbot is playing with IPV6_ADDRFORM quite a lot these days, and managed to hit the WARN_ON_ONCE(1) in sk_mc_loop()
We have many more similar issues to fix.
WARNING: CPU: 1 PID: 1593 at net/core/sock.c:782 sk_mc_loop+0x165/0x260 Modules linked in: CPU: 1 PID: 1593 Comm: kworker/1:3 Not tainted 6.1.40-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023 Workqueue: events_power_efficient gc_worker RIP: 0010:sk_mc_loop+0x165/0x260 net/core/sock.c:782 Code: 34 1b fd 49 81 c7 18 05 00 00 4c 89 f8 48 c1 e8 03 42 80 3c 20 00 74 08 4c 89 ff e8 25 36 6d fd 4d 8b 37 eb 13 e8 db 33 1b fd <0f> 0b b3 01 eb 34 e8 d0 33 1b fd 45 31 f6 49 83 c6 38 4c 89 f0 48 RSP: 0018:ffffc90000388530 EFLAGS: 00010246 RAX: ffffffff846d9b55 RBX: 0000000000000011 RCX: ffff88814f884980 RDX: 0000000000000102 RSI: ffffffff87ae5160 RDI: 0000000000000011 RBP: ffffc90000388550 R08: 0000000000000003 R09: ffffffff846d9a65 R10: 0000000000000002 R11: ffff88814f884980 R12: dffffc0000000000 R13: ffff88810dbee000 R14: 0000000000000010 R15: ffff888150084000 FS: 0000000000000000(0000) GS:ffff8881f6b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000180 CR3: 000000014ee5b000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> [<ffffffff8507734f>] ip6_finish_output2+0x33f/0x1ae0 net/ipv6/ip6_output.c:83 [<ffffffff85062766>] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline] [<ffffffff85062766>] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211 [<ffffffff85061f8c>] NF_HOOK_COND include/linux/netfilter.h:298 [inline] [<ffffffff85061f8c>] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232 [<ffffffff852071cf>] dst_output include/net/dst.h:444 [inline] [<ffffffff852071cf>] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161 [<ffffffff83618fb4>] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline] [<ffffffff83618fb4>] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline] [<ffffffff83618fb4>] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline] [<ffffffff83618fb4>] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677 [<ffffffff8361ddd9>] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229 [<ffffffff84763fc0>] netdev_start_xmit include/linux/netdevice.h:4925 [inline] [<ffffffff84763fc0>] xmit_one net/core/dev.c:3644 [inline] [<ffffffff84763fc0>] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660 [<ffffffff8494c650>] sch_direct_xmit+0x2a0/0x9c0 net/sched/sch_generic.c:342 [<ffffffff8494d883>] qdisc_restart net/sched/sch_generic.c:407 [inline] [<ffffffff8494d883>] __qdisc_run+0xb13/0x1e70 net/sched/sch_generic.c:415 [<ffffffff8478c426>] qdisc_run+0xd6/0x260 include/net/pkt_sched.h:125 [<ffffffff84796eac>] net_tx_action+0x7ac/0x940 net/core/dev.c:5247 [<ffffffff858002bd>] __do_softirq+0x2bd/0x9bd kernel/softirq.c:599 [<ffffffff814c3fe8>] invoke_softirq kernel/softirq.c:430 [inline] [<ffffffff814c3fe8>] __irq_exit_rcu+0xc8/0x170 kernel/softirq.c:683 [<ffffffff814c3f09>] irq_exit_rcu+0x9/0x20 kernel/softirq.c:695
--- net/core/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/sock.c +2 -1
@@ -701,7 +701,8 @@ bool sk_mc_loop(struct sock *sk)return false;if (!sk)return true; -switch (sk->sk_family) { +/* IPV6_ADDRFORM can change sk->sk_family under us. */ +switch (READ_ONCE (sk->sk_family)) {case AF_INET :return inet_sk (sk)->mc_loop;#if IS_ENABLED (CONFIG_IPV6 )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 261/367 igb: disable virtualization features on 82580
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Corinna Vinschen <[email protected]>
[ Upstream commit fa09bc40b21a33937872c4c4cf0f266ec9fa4869 ]
Disable virtualization features on 82580 just as on i210/i211. This avoids that virt functions are acidentally called on 82850.
--- drivers/net/ethernet/intel/igb/igb_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +3 -2
@@ -3710,8 +3710,9 @@ static void igb_probe_vfs(struct igb_adapter *adapter)struct pci_dev *pdev = adapter->pdev;struct e1000_hw *hw = &adapter->hw; -/* Virtualization features not supported on i210 family. */ -if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) +/* Virtualization features not supported on i210 and 82580 family. */ +if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211) || + (hw->mac.type == e1000_82580))return ;/* Of the below we really only want the effect of getting
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 262/367 veth: Fixing transmit return status for dropped packets
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liang Chen <[email protected]>
[ Upstream commit 151e887d8ff97e2e42110ffa1fb1e6a2128fb364 ]
The veth_xmit function returns NETDEV_TX_OK even when packets are dropped. This behavior leads to incorrect calculations of statistics counts, as well as things like txq->trans_start updates.
--- drivers/net/veth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/veth.c +3 -1
@@ -238,6 +238,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) {struct veth_priv *rcv_priv, *priv =netdev_priv (dev);struct veth_rq *rq =NULL ; +int ret =NETDEV_TX_OK ;struct net_device *rcv;int length = skb->len;bool rcv_xdp = false;
@@ -270,6 +271,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) }else { drop:atomic64_inc (&priv->dropped); + ret =NET_XMIT_DROP ; }if (rcv_xdp)
@@ -277,7 +279,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)rcu_read_unlock (); -return NETDEV_TX_OK ; +return ret; }static u64 veth_stats_tx (struct pcpu_lstats *result,struct net_device *dev)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 263/367 net: ipv6/addrconf: avoid integer underflow in ipv6_create_tempaddr
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Henrie <[email protected]>
[ Upstream commit f31867d0d9d82af757c1e0178b659438f4c1ea3c ]
The existing code incorrectly casted a negative value (the result of a subtraction) to an unsigned value without checking. For example, if /proc/sys/net/ipv6/conf/*/temp_prefered_lft was set to 1, the preferred lifetime would jump to 4 billion seconds. On my machine and network the shortest lifetime that avoided underflow was 3 seconds.
--- net/ipv6/addrconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/addrconf.c +1 -1
@@ -1367,7 +1367,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp,* idev->desync_factor if it's larger */ cnf_temp_preferred_lft =READ_ONCE (idev->cnf.temp_prefered_lft); - max_desync_factor =min_t (__u32, + max_desync_factor =min_t (long, idev->cnf.max_desync_factor, cnf_temp_preferred_lft - regen_advance);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 264/367 af_unix: Fix data-races around user->unix_inflight.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 0bc36c0650b21df36fbec8136add83936eaf0607 ]
user->unix_inflight is changed under spin_lock(unix_gc_lock), but too_many_unix_fds() reads it locklessly.
Let's annotate the write/read accesses to user->unix_inflight.
BUG: KCSAN: data-race in unix_attach_fds / unix_inflight
write to 0xffffffff8546f2d0 of 8 bytes by task 44798 on cpu 1:
unix_inflight+0x157/0x180 net/unix/scm.c:66 unix_attach_fds+0x147/0x1e0 net/unix/scm.c:123 unix_scm_to_skb net/unix/af_unix.c:1827 [inline] unix_dgram_sendmsg+0x46a/0x14f0 net/unix/af_unix.c:1950 unix_seqpacket_sendmsg net/unix/af_unix.c:2308 [inline] unix_seqpacket_sendmsg+0xba/0x130 net/unix/af_unix.c:2292 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg+0x148/0x160 net/socket.c:748 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2494 ___sys_sendmsg+0xc6/0x140 net/socket.c:2548 __sys_sendmsg+0x94/0x140 net/socket.c:2577 __do_sys_sendmsg net/socket.c:2586 [inline] __se_sys_sendmsg net/socket.c:2584 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
read to 0xffffffff8546f2d0 of 8 bytes by task 44814 on cpu 0:
too_many_unix_fds net/unix/scm.c:101 [inline] unix_attach_fds+0x54/0x1e0 net/unix/scm.c:110 unix_scm_to_skb net/unix/af_unix.c:1827 [inline] unix_dgram_sendmsg+0x46a/0x14f0 net/unix/af_unix.c:1950 unix_seqpacket_sendmsg net/unix/af_unix.c:2308 [inline] unix_seqpacket_sendmsg+0xba/0x130 net/unix/af_unix.c:2292 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg+0x148/0x160 net/socket.c:748 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2494 ___sys_sendmsg+0xc6/0x140 net/socket.c:2548 __sys_sendmsg+0x94/0x140 net/socket.c:2577 __do_sys_sendmsg net/socket.c:2586 [inline] __se_sys_sendmsg net/socket.c:2584 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
value changed: 0x000000000000000c -> 0x000000000000000d
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 44814 Comm: systemd-coredum Not tainted 6.4.0-11989-g6843306689af #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/unix/scm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/unix/scm.c +3 -3
@@ -62,7 +62,7 @@ void unix_inflight(struct user_struct *user, struct file *fp)/* Paired with READ_ONCE() in wait_for_unix_gc() */ WRITE_ONCE (unix_tot_inflight, unix_tot_inflight +1 ); } - user->unix_inflight++; +WRITE_ONCE (user->unix_inflight, user->unix_inflight +1 );spin_unlock (&unix_gc_lock); }
@@ -83,7 +83,7 @@ void unix_notinflight(struct user_struct *user, struct file *fp)/* Paired with READ_ONCE() in wait_for_unix_gc() */ WRITE_ONCE (unix_tot_inflight, unix_tot_inflight -1 ); } - user->unix_inflight--; +WRITE_ONCE (user->unix_inflight, user->unix_inflight -1 );spin_unlock (&unix_gc_lock); }
@@ -97,7 +97,7 @@ static inline bool too_many_unix_fds(struct task_struct *p) {struct user_struct *user =current_user (); -if (unlikely (user->unix_inflight >task_rlimit (p,RLIMIT_NOFILE ))) +if (unlikely (READ_ONCE (user->unix_inflight) >task_rlimit (p,RLIMIT_NOFILE )))return !capable (CAP_SYS_RESOURCE ) && !capable (CAP_SYS_ADMIN );return false; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 265/367 af_unix: Fix data-race around unix_tot_inflight.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit ade32bd8a738d7497ffe9743c46728db26740f78 ]
unix_tot_inflight is changed under spin_lock(unix_gc_lock), but unix_release_sock() reads it locklessly.
Let's use READ_ONCE() for unix_tot_inflight.
Note that the writer side was marked by commit 9d6d7f1cb67c ("af_unix:
annote lockless accesses to unix_tot_inflight & gc_in_progress")
BUG: KCSAN: data-race in unix_inflight / unix_release_sock
write (marked) to 0xffffffff871852b8 of 4 bytes by task 123 on cpu 1:
unix_inflight+0x130/0x180 net/unix/scm.c:64 unix_attach_fds+0x137/0x1b0 net/unix/scm.c:123 unix_scm_to_skb net/unix/af_unix.c:1832 [inline] unix_dgram_sendmsg+0x46a/0x14f0 net/unix/af_unix.c:1955 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x148/0x160 net/socket.c:747 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2493 ___sys_sendmsg+0xc6/0x140 net/socket.c:2547 __sys_sendmsg+0x94/0x140 net/socket.c:2576 __do_sys_sendmsg net/socket.c:2585 [inline] __se_sys_sendmsg net/socket.c:2583 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2583 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc
read to 0xffffffff871852b8 of 4 bytes by task 4891 on cpu 0:
unix_release_sock+0x608/0x910 net/unix/af_unix.c:671 unix_release+0x59/0x80 net/unix/af_unix.c:1058 __sock_release+0x7d/0x170 net/socket.c:653 sock_close+0x19/0x30 net/socket.c:1385 __fput+0x179/0x5e0 fs/file_table.c:321 ____fput+0x15/0x20 fs/file_table.c:349 task_work_run+0x116/0x1a0 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x174/0x180 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:286 [inline] syscall_exit_to_user_mode+0x1a/0x30 kernel/entry/common.c:297 do_syscall_64+0x4b/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x72/0xdc
value changed: 0x00000000 -> 0x00000001
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 4891 Comm: systemd-coredum Not tainted 6.4.0-rc5-01219-gfa0e21fa4443 #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/unix/af_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/unix/af_unix.c +1 -1
@@ -589,7 +589,7 @@ static void unix_release_sock(struct sock *sk, int embrion)* What the above comment does talk about? --ANK(980817) */ -if (unix_tot_inflight) +if (READ_ONCE (unix_tot_inflight))unix_gc ();/* Garbage collect fds */ }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 266/367 af_unix: Fix data-races around sk->sk_shutdown.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit afe8764f76346ba838d4f162883e23d2fcfaa90e ]
sk->sk_shutdown is changed under unix_state_lock(sk), but unix_dgram_sendmsg() calls two functions to read sk_shutdown locklessly.
sock_alloc_send_pskb
`- sock_wait_for_wmem
Let's use READ_ONCE() there.
Note that the writer side was marked by commit e1d09c2c2f57 ("af_unix:
Fix data races around sk->sk_shutdown.").
BUG: KCSAN: data-race in sock_alloc_send_pskb / unix_release_sock
write (marked) to 0xffff8880069af12c of 1 bytes by task 1 on cpu 1:
unix_release_sock+0x75c/0x910 net/unix/af_unix.c:631 unix_release+0x59/0x80 net/unix/af_unix.c:1053 __sock_release+0x7d/0x170 net/socket.c:654 sock_close+0x19/0x30 net/socket.c:1386 __fput+0x2a3/0x680 fs/file_table.c:384 ____fput+0x15/0x20 fs/file_table.c:412 task_work_run+0x116/0x1a0 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x174/0x180 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:286 [inline] syscall_exit_to_user_mode+0x1a/0x30 kernel/entry/common.c:297 do_syscall_64+0x4b/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
read to 0xffff8880069af12c of 1 bytes by task 28650 on cpu 0:
sock_alloc_send_pskb+0xd2/0x620 net/core/sock.c:2767 unix_dgram_sendmsg+0x2f8/0x14f0 net/unix/af_unix.c:1944 unix_seqpacket_sendmsg net/unix/af_unix.c:2308 [inline] unix_seqpacket_sendmsg+0xba/0x130 net/unix/af_unix.c:2292 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg+0x148/0x160 net/socket.c:748 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2494 ___sys_sendmsg+0xc6/0x140 net/socket.c:2548 __sys_sendmsg+0x94/0x140 net/socket.c:2577 __do_sys_sendmsg net/socket.c:2586 [inline] __se_sys_sendmsg net/socket.c:2584 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
value changed: 0x00 -> 0x03
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 28650 Comm: systemd-coredum Not tainted 6.4.0-11989-g6843306689af #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/core/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/sock.c +2 -2
@@ -2223,7 +2223,7 @@ static long sock_wait_for_wmem(struct sock *sk, long timeo)prepare_to_wait (sk_sleep (sk), &wait,TASK_INTERRUPTIBLE );if (refcount_read (&sk->sk_wmem_alloc) <READ_ONCE (sk->sk_sndbuf))break ; -if (sk->sk_shutdown &SEND_SHUTDOWN ) +if (READ_ONCE (sk->sk_shutdown) &SEND_SHUTDOWN )break ;if (sk->sk_err)break ;
@@ -2253,7 +2253,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, goto failure; err = -EPIPE ; -if (sk->sk_shutdown &SEND_SHUTDOWN ) +if (READ_ONCE (sk->sk_shutdown) &SEND_SHUTDOWN ) goto failure;if (sk_wmem_alloc_get (sk) <READ_ONCE (sk->sk_sndbuf))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 267/367 af_unix: Fix data race around sk->sk_err.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit b192812905e4b134f7b7994b079eb647e9d2d37e ]
As with sk->sk_shutdown shown in the previous patch, sk->sk_err can be read locklessly by unix_dgram_sendmsg().
Let's use READ_ONCE() for sk_err as well.
Note that the writer side is marked by commit cc04410af7de ("af_unix:
annotate lockless accesses to sk->sk_err").
--- net/core/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/sock.c +1 -1
@@ -2225,7 +2225,7 @@ static long sock_wait_for_wmem(struct sock *sk, long timeo)break ;if (READ_ONCE (sk->sk_shutdown) &SEND_SHUTDOWN )break ; -if (sk->sk_err) +if (READ_ONCE (sk->sk_err))break ; timeo =schedule_timeout (timeo); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 268/367 net: sched: sch_qfq: Fix UAF in qfq_dequeue()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: valis <[email protected]>
[ Upstream commit 8fc134fee27f2263988ae38920bc03da416b03d8 ]
When the plug qdisc is used as a class of the qfq qdisc it could trigger a UAF. This issue can be reproduced with following commands:
tc qdisc add dev lo root handle 1: qfq
tc class add dev lo parent 1: classid 1:1 qfq weight 1 maxpkt 512 tc qdisc add dev lo parent 1:1 handle 2: plug
tc filter add dev lo parent 1: basic classid 1:1
ping -c1 127.0.0.1
and boom:
[ 285.353793] BUG: KASAN: slab-use-after-free in qfq_dequeue+0xa7/0x7f0 [ 285.354910] Read of size 4 at addr ffff8880bad312a8 by task ping/144 [ 285.355903] [ 285.356165] CPU: 1 PID: 144 Comm: ping Not tainted 6.5.0-rc3+ #4 [ 285.357112] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 [ 285.358376] Call Trace: [ 285.358773] <IRQ> [ 285.359109] dump_stack_lvl+0x44/0x60 [ 285.359708] print_address_description.constprop.0+0x2c/0x3c0 [ 285.360611] kasan_report+0x10c/0x120 [ 285.361195] ? qfq_dequeue+0xa7/0x7f0 [ 285.361780] qfq_dequeue+0xa7/0x7f0 [ 285.362342] __qdisc_run+0xf1/0x970 [ 285.362903] net_tx_action+0x28e/0x460 [ 285.363502] __do_softirq+0x11b/0x3de [ 285.364097] do_softirq.part.0+0x72/0x90 [ 285.364721] </IRQ> [ 285.365072] <TASK> [ 285.365422] __local_bh_enable_ip+0x77/0x90 [ 285.366079] __dev_queue_xmit+0x95f/0x1550 [ 285.366732] ? __pfx_csum_and_copy_from_iter+0x10/0x10 [ 285.367526] ? __pfx___dev_queue_xmit+0x10/0x10 [ 285.368259] ? __build_skb_around+0x129/0x190 [ 285.368960] ? ip_generic_getfrag+0x12c/0x170 [ 285.369653] ? __pfx_ip_generic_getfrag+0x10/0x10 [ 285.370390] ? csum_partial+0x8/0x20 [ 285.370961] ? raw_getfrag+0xe5/0x140 [ 285.371559] ip_finish_output2+0x539/0xa40 [ 285.372222] ? __pfx_ip_finish_output2+0x10/0x10 [ 285.372954] ip_output+0x113/0x1e0 [ 285.373512] ? __pfx_ip_output+0x10/0x10 [ 285.374130] ? icmp_out_count+0x49/0x60 [ 285.374739] ? __pfx_ip_finish_output+0x10/0x10 [ 285.375457] ip_push_pending_frames+0xf3/0x100 [ 285.376173] raw_sendmsg+0xef5/0x12d0 [ 285.376760] ? do_syscall_64+0x40/0x90 [ 285.377359] ? __static_call_text_end+0x136578/0x136578 [ 285.378173] ? do_syscall_64+0x40/0x90 [ 285.378772] ? kasan_enable_current+0x11/0x20 [ 285.379469] ? __pfx_raw_sendmsg+0x10/0x10 [ 285.380137] ? __sock_create+0x13e/0x270 [ 285.380673] ? __sys_socket+0xf3/0x180 [ 285.381174] ? __x64_sys_socket+0x3d/0x50 [ 285.381725] ? entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 285.382425] ? __rcu_read_unlock+0x48/0x70 [ 285.382975] ? ip4_datagram_release_cb+0xd8/0x380 [ 285.383608] ? __pfx_ip4_datagram_release_cb+0x10/0x10 [ 285.384295] ? preempt_count_sub+0x14/0xc0 [ 285.384844] ? __list_del_entry_valid+0x76/0x140 [ 285.385467] ? _raw_spin_lock_bh+0x87/0xe0 [ 285.386014] ? __pfx__raw_spin_lock_bh+0x10/0x10 [ 285.386645] ? release_sock+0xa0/0xd0 [ 285.387148] ? preempt_count_sub+0x14/0xc0 [ 285.387712] ? freeze_secondary_cpus+0x348/0x3c0 [ 285.388341] ? aa_sk_perm+0x177/0x390 [ 285.388856] ? __pfx_aa_sk_perm+0x10/0x10 [ 285.389441] ? check_stack_object+0x22/0x70 [ 285.390032] ? inet_send_prepare+0x2f/0x120 [ 285.390603] ? __pfx_inet_sendmsg+0x10/0x10 [ 285.391172] sock_sendmsg+0xcc/0xe0 [ 285.391667] __sys_sendto+0x190/0x230 [ 285.392168] ? __pfx___sys_sendto+0x10/0x10 [ 285.392727] ? kvm_clock_get_cycles+0x14/0x30 [ 285.393328] ? set_normalized_timespec64+0x57/0x70 [ 285.393980] ? _raw_spin_unlock_irq+0x1b/0x40 [ 285.394578] ? __x64_sys_clock_gettime+0x11c/0x160 [ 285.395225] ? __pfx___x64_sys_clock_gettime+0x10/0x10 [ 285.395908] ? _copy_to_user+0x3e/0x60 [ 285.396432] ? exit_to_user_mode_prepare+0x1a/0x120 [ 285.397086] ? syscall_exit_to_user_mode+0x22/0x50 [ 285.397734] ? do_syscall_64+0x71/0x90 [ 285.398258] __x64_sys_sendto+0x74/0x90 [ 285.398786] do_syscall_64+0x64/0x90 [ 285.399273] ? exit_to_user_mode_prepare+0x1a/0x120 [ 285.399949] ? syscall_exit_to_user_mode+0x22/0x50 [ 285.400605] ? do_syscall_64+0x71/0x90 [ 285.401124] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 285.401807] RIP: 0033:0x495726 [ 285.402233] Code: ff ff ff f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 41 89 ca 64 8b 04 25 18 00 00 00 85 c0 75 11 b8 2c 00 00 00 0f 09 [ 285.404683] RSP: 002b:00007ffcc25fb618 EFLAGS: 00000246 ORIG_RAX: 000000000000002c [ 285.405677] RAX: ffffffffffffffda RBX: 0000000000000040 RCX: 0000000000495726 [ 285.406628] RDX: 0000000000000040 RSI: 0000000002518750 RDI: 0000000000000000 [ 285.407565] RBP: 00000000005205ef R08: 00000000005f8838 R09: 000000000000001c [ 285.408523] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000002517634 [ 285.409460] R13: 00007ffcc25fb6f0 R14: 0000000000000003 R15: 0000000000000000 [ 285.410403] </TASK> [ 285.410704] [ 285.410929] Allocated by task 144: [ 285.411402] kasan_save_stack+0x1e/0x40 [ 285.411926] kasan_set_track+0x21/0x30 [ 285.412442] __kasan_slab_alloc+0x55/0x70 [ 285.412973] kmem_cache_alloc_node+0x187/0x3d0 [ 285.413567] __alloc_skb+0x1b4/0x230 [ 285.414060] __ip_append_data+0x17f7/0x1b60 [ 285.414633] ip_append_data+0x97/0xf0 [ 285.415144] raw_sendmsg+0x5a8/0x12d0 [ 285.415640] sock_sendmsg+0xcc/0xe0 [ 285.416117] __sys_sendto+0x190/0x230 [ 285.416626] __x64_sys_sendto+0x74/0x90 [ 285.417145] do_syscall_64+0x64/0x90 [ 285.417624] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 285.418306] [ 285.418531] Freed by task 144: [ 285.418960] kasan_save_stack+0x1e/0x40 [ 285.419469] kasan_set_track+0x21/0x30 [ 285.419988] kasan_save_free_info+0x27/0x40 [ 285.420556] ____kasan_slab_free+0x109/0x1a0 [ 285.421146] kmem_cache_free+0x1c2/0x450 [ 285.421680] __netif_receive_skb_core+0x2ce/0x1870 [ 285.422333] __netif_receive_skb_one_core+0x97/0x140 [ 285.423003] process_backlog+0x100/0x2f0 [ 285.423537] __napi_poll+0x5c/0x2d0 [ 285.424023] net_rx_action+0x2be/0x560 [ 285.424510] __do_softirq+0x11b/0x3de [ 285.425034] [ 285.425254] The buggy address belongs to the object at ffff8880bad31280 [ 285.425254] which belongs to the cache skbuff_head_cache of size 224 [ 285.426993] The buggy address is located 40 bytes inside of [ 285.426993] freed 224-byte region [ffff8880bad31280, ffff8880bad31360) [ 285.428572] [ 285.428798] The buggy address belongs to the physical page: [ 285.429540] page:00000000f4b77674 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0xbad31 [ 285.430758] flags: 0x100000000000200(slab|node=0|zone=1) [ 285.431447] page_type: 0xffffffff() [ 285.431934] raw: 0100000000000200 ffff88810094a8c0 dead000000000122 0000000000000000 [ 285.432757] raw: 0000000000000000 00000000800c000c 00000001ffffffff 0000000000000000 [ 285.433562] page dumped because: kasan: bad access detected [ 285.434144] [ 285.434320] Memory state around the buggy address: [ 285.434828] ffff8880bad31180: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 285.435580] ffff8880bad31200: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 285.436264] >ffff8880bad31280: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 285.436777] ^ [ 285.437106] ffff8880bad31300: fb fb fb fb fb fb fb fb fb fb fb fb fc fc fc fc [ 285.437616] ffff8880bad31380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 285.438126] ================================================================== [ 285.438662] Disabling lock debugging due to kernel taint
Fix this by:
1. Changing sch_plug's .peek handler to qdisc_peek_dequeued(), a function compatible with non-work-conserving qdiscs
2. Checking the return value of qdisc_dequeue_peeked() in sch_qfq.
--- net/sched/sch_plug.c | 2 +- net/sched/sch_qfq.c | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-)
net/sched/sch_plug.c +1 -1
@@ -210,7 +210,7 @@ static struct Qdisc_ops plug_qdisc_ops __read_mostly = { .priv_size = sizeof(struct plug_sched_data), .enqueue = plug_enqueue, .dequeue = plug_dequeue, - .peek = qdisc_peek_head, + .peek = qdisc_peek_dequeued, .init = plug_init, .change = plug_change, .reset = qdisc_reset_queue,
net/sched/sch_qfq.c +17 -5
@@ -975,10 +975,13 @@ static void qfq_update_eligible(struct qfq_sched *q) }/* Dequeue head packet of the head class in the DRR queue of the aggregate. */ -static void agg_dequeue (struct qfq_aggregate *agg, -struct qfq_class *cl,unsigned int len) +static struct sk_buff *agg_dequeue (struct qfq_aggregate *agg, +struct qfq_class *cl,unsigned int len) { -qdisc_dequeue_peeked (cl->qdisc); +struct sk_buff *skb =qdisc_dequeue_peeked (cl->qdisc); + +if (!skb) +return NULL ; cl->deficit -= (int ) len;
@@ -988,6 +991,8 @@ static void agg_dequeue(struct qfq_aggregate *agg, cl->deficit += agg->lmax;list_move_tail (&cl->alist, &agg->active); } + +return skb; } static inline struct sk_buff *qfq_peek_skb(struct qfq_aggregate *agg,
@@ -1133,11 +1138,18 @@ static struct sk_buff *qfq_dequeue(struct Qdisc *sch)if (!skb)return NULL ; -qdisc_qstats_backlog_dec (sch, skb); sch->q.qlen--; + + skb =agg_dequeue (in_serv_agg, cl, len); + +if (!skb) { + sch->q.qlen++; +return NULL ; + } + +qdisc_qstats_backlog_dec (sch, skb);qdisc_bstats_update (sch, skb); -agg_dequeue (in_serv_agg, cl, len);/* If lmax is lowered, through qfq_change_class, for a class * owning pending packets with larger size than the new value * of lmax, then the following condition may hold.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 269/367 kcm: Destroy mutex in kcm_exit_net()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit 6ad40b36cd3b04209e2d6c89d252c873d8082a59 ]
kcm_exit_net() should call mutex_destroy() on knet->mutex. This is especially needed if CONFIG_DEBUG_MUTEXES is enabled.
--- net/kcm/kcmsock.c | 2 ++ 1 file changed, 2 insertions(+)
net/kcm/kcmsock.c +2 -0
@@ -1984,6 +1984,8 @@ static __net_exit void kcm_exit_net(struct net *net)* that all multiplexors and psocks have been destroyed. */ WARN_ON (!list_empty (&knet->mux_list)); + +mutex_destroy (&knet->mutex); }static struct pernet_operations kcm_net_ops = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 270/367 igc: Change IGC_MIN to allow set rx/tx value between 64 and 80
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Zaborska <[email protected]>
[ Upstream commit 5aa48279712e1f134aac908acde4df798955a955 ]
Change the minimum value of RX/TX descriptors to 64 to enable setting the rx/tx value between 64 and 80. All igc devices can use as low as 64 descriptors. This change will unify igc with other drivers.
Based on commit 7b1be1987c1e ("e1000e: lower ring minimum size to 64")
--- drivers/net/ethernet/intel/igc/igc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igc/igc.h +2 -2
@@ -78,11 +78,11 @@ extern char igc_driver_version[];/* TX/RX descriptor defines */ #define IGC_DEFAULT_TXD 256#define IGC_DEFAULT_TX_WORK 128 -#define IGC_MIN_TXD 80 +#define IGC_MIN_TXD 64#define IGC_MAX_TXD 4096#define IGC_DEFAULT_RXD 256 -#define IGC_MIN_RXD 80 +#define IGC_MIN_RXD 64#define IGC_MAX_RXD 4096/* Transmit and receive queues */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 271/367 igbvf: Change IGBVF_MIN to allow set rx/tx value between 64 and 80
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Zaborska <[email protected]>
[ Upstream commit 8360717524a24a421c36ef8eb512406dbd42160a ]
Change the minimum value of RX/TX descriptors to 64 to enable setting the rx/tx value between 64 and 80. All igbvf devices can use as low as 64 descriptors. This change will unify igbvf with other drivers.
Based on commit 7b1be1987c1e ("e1000e: lower ring minimum size to 64")
--- drivers/net/ethernet/intel/igbvf/igbvf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igbvf/igbvf.h +2 -2
@@ -39,11 +39,11 @@ enum latency_range {/* Tx/Rx descriptor defines */ #define IGBVF_DEFAULT_TXD 256#define IGBVF_MAX_TXD 4096 -#define IGBVF_MIN_TXD 80 +#define IGBVF_MIN_TXD 64#define IGBVF_DEFAULT_RXD 256#define IGBVF_MAX_RXD 4096 -#define IGBVF_MIN_RXD 80 +#define IGBVF_MIN_RXD 64#define IGBVF_MIN_ITR_USECS 10/* 100000 irq/sec */ #define IGBVF_MAX_ITR_USECS 10000/* 100 irq/sec */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 272/367 igb: Change IGB_MIN to allow set rx/tx value between 64 and 80
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Zaborska <[email protected]>
[ Upstream commit 6319685bdc8ad5310890add907b7c42f89302886 ]
Change the minimum value of RX/TX descriptors to 64 to enable setting the rx/tx value between 64 and 80. All igb devices can use as low as 64 descriptors. This change will unify igb with other drivers.
Based on commit 7b1be1987c1e ("e1000e: lower ring minimum size to 64")
--- drivers/net/ethernet/intel/igb/igb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igb/igb.h +2 -2
@@ -32,11 +32,11 @@ struct igb_adapter;/* TX/RX descriptor defines */ #define IGB_DEFAULT_TXD 256#define IGB_DEFAULT_TX_WORK 128 -#define IGB_MIN_TXD 80 +#define IGB_MIN_TXD 64#define IGB_MAX_TXD 4096#define IGB_DEFAULT_RXD 256 -#define IGB_MIN_RXD 80 +#define IGB_MIN_RXD 64#define IGB_MAX_RXD 4096#define IGB_DEFAULT_ITR 3/* dynamic */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 273/367 s390/zcrypt: dont leak memory if dev_set_name() fails
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 6252f47b78031979ad919f971dc8468b893488bd ]
When dev_set_name() fails, zcdn_create() doesn't free the newly allocated resources. Do it.
--- drivers/s390/crypto/zcrypt_api.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/crypto/zcrypt_api.c +1 -0
@@ -397,6 +397,7 @@ static int zcdn_create(const char *name) ZCRYPT_NAME "_%d", (int) MINOR(devt)); nodename[sizeof (nodename)-1 ] ='\0' ;if (dev_set_name (&zcdndev->device, nodename)) { +kfree (zcdndev); rc = -EINVAL ; goto unlockout; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 274/367 idr: fix param name in idr_alloc_cyclic() doc
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ariel Marcovitch <[email protected]>
[ Upstream commit 2a15de80dd0f7e04a823291aa9eb49c5294f56af ]
The relevant parameter is 'start' and not 'nextid'
--- lib/idr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/idr.c +1 -1
@@ -100,7 +100,7 @@ EXPORT_SYMBOL_GPL(idr_alloc);* @end: The maximum ID (exclusive). * @gfp: Memory allocation flags. * -* Allocates an unused ID in the range specified by @nextid and @end. If +* Allocates an unused ID in the range specified by @start and @end. If * @end is <= 0, it is treated as one larger than %INT_MAX. This allows * callers to use @start + N as @end as long as N is within integer range. * The search for an unused ID will start at the last ID allocated and will
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 275/367 ip_tunnels: use DEV_STATS_INC()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9b271ebaf9a2c5c566a54bc6cd915962e8241130 ]
syzbot/KCSAN reported data-races in iptunnel_xmit_stats() [1]
This can run from multiple cpus without mutual exclusion.
Adopt SMP safe DEV_STATS_INC() to update dev->stats fields.
[1]
BUG: KCSAN: data-race in iptunnel_xmit / iptunnel_xmit
read-write to 0xffff8881353df170 of 8 bytes by task 30263 on cpu 1:
iptunnel_xmit_stats include/net/ip_tunnels.h:493 [inline] iptunnel_xmit+0x432/0x4a0 net/ipv4/ip_tunnel_core.c:87 ip_tunnel_xmit+0x1477/0x1750 net/ipv4/ip_tunnel.c:831 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:662 __netdev_start_xmit include/linux/netdevice.h:4889 [inline] netdev_start_xmit include/linux/netdevice.h:4903 [inline] xmit_one net/core/dev.c:3544 [inline] dev_hard_start_xmit+0x11b/0x3f0 net/core/dev.c:3560 __dev_queue_xmit+0xeee/0x1de0 net/core/dev.c:4340 dev_queue_xmit include/linux/netdevice.h:3082 [inline] __bpf_tx_skb net/core/filter.c:2129 [inline] __bpf_redirect_no_mac net/core/filter.c:2159 [inline] __bpf_redirect+0x723/0x9c0 net/core/filter.c:2182 ____bpf_clone_redirect net/core/filter.c:2453 [inline] bpf_clone_redirect+0x16c/0x1d0 net/core/filter.c:2425 ___bpf_prog_run+0xd7d/0x41e0 kernel/bpf/core.c:1954 __bpf_prog_run512+0x74/0xa0 kernel/bpf/core.c:2195 bpf_dispatcher_nop_func include/linux/bpf.h:1181 [inline] __bpf_prog_run include/linux/filter.h:609 [inline] bpf_prog_run include/linux/filter.h:616 [inline] bpf_test_run+0x15d/0x3d0 net/bpf/test_run.c:423 bpf_prog_test_run_skb+0x77b/0xa00 net/bpf/test_run.c:1045 bpf_prog_test_run+0x265/0x3d0 kernel/bpf/syscall.c:3996 __sys_bpf+0x3af/0x780 kernel/bpf/syscall.c:5353 __do_sys_bpf kernel/bpf/syscall.c:5439 [inline] __se_sys_bpf kernel/bpf/syscall.c:5437 [inline] __x64_sys_bpf+0x43/0x50 kernel/bpf/syscall.c:5437 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
read-write to 0xffff8881353df170 of 8 bytes by task 30249 on cpu 0:
iptunnel_xmit_stats include/net/ip_tunnels.h:493 [inline] iptunnel_xmit+0x432/0x4a0 net/ipv4/ip_tunnel_core.c:87 ip_tunnel_xmit+0x1477/0x1750 net/ipv4/ip_tunnel.c:831 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:662 __netdev_start_xmit include/linux/netdevice.h:4889 [inline] netdev_start_xmit include/linux/netdevice.h:4903 [inline] xmit_one net/core/dev.c:3544 [inline] dev_hard_start_xmit+0x11b/0x3f0 net/core/dev.c:3560 __dev_queue_xmit+0xeee/0x1de0 net/core/dev.c:4340 dev_queue_xmit include/linux/netdevice.h:3082 [inline] __bpf_tx_skb net/core/filter.c:2129 [inline] __bpf_redirect_no_mac net/core/filter.c:2159 [inline] __bpf_redirect+0x723/0x9c0 net/core/filter.c:2182 ____bpf_clone_redirect net/core/filter.c:2453 [inline] bpf_clone_redirect+0x16c/0x1d0 net/core/filter.c:2425 ___bpf_prog_run+0xd7d/0x41e0 kernel/bpf/core.c:1954 __bpf_prog_run512+0x74/0xa0 kernel/bpf/core.c:2195 bpf_dispatcher_nop_func include/linux/bpf.h:1181 [inline] __bpf_prog_run include/linux/filter.h:609 [inline] bpf_prog_run include/linux/filter.h:616 [inline] bpf_test_run+0x15d/0x3d0 net/bpf/test_run.c:423 bpf_prog_test_run_skb+0x77b/0xa00 net/bpf/test_run.c:1045 bpf_prog_test_run+0x265/0x3d0 kernel/bpf/syscall.c:3996 __sys_bpf+0x3af/0x780 kernel/bpf/syscall.c:5353 __do_sys_bpf kernel/bpf/syscall.c:5439 [inline] __se_sys_bpf kernel/bpf/syscall.c:5437 [inline] __x64_sys_bpf+0x43/0x50 kernel/bpf/syscall.c:5437 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0x0000000000018830 -> 0x0000000000018831
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 30249 Comm: syz-executor.4 Not tainted 6.5.0-syzkaller-11704-g3f86ed6ec0b3 #0
--- include/net/ip_tunnels.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
include/net/ip_tunnels.h +7 -8
@@ -449,15 +449,14 @@ static inline void iptunnel_xmit_stats(struct net_device *dev, int pkt_len) tstats->tx_packets++;u64_stats_update_end (&tstats->syncp);put_cpu_ptr (tstats); +return ; + } + +if (pkt_len <0 ) { +DEV_STATS_INC (dev, tx_errors); +DEV_STATS_INC (dev, tx_aborted_errors); }else { -struct net_device_stats *err_stats = &dev->stats; - -if (pkt_len <0 ) { - err_stats->tx_errors++; - err_stats->tx_aborted_errors++; - }else { - err_stats->tx_dropped++; - } +DEV_STATS_INC (dev, tx_dropped); } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 276/367 netfilter: nfnetlink_osf: avoid OOB read
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wander Lairson Costa <[email protected]>
[ Upstream commit f4f8a7803119005e87b716874bec07c751efafec ]
The opt_num field is controlled by user mode and is not currently validated inside the kernel. An attacker can take advantage of this to trigger an OOB read and potentially leak information.
BUG: KASAN: slab-out-of-bounds in nf_osf_match_one+0xbed/0xd10 net/netfilter/nfnetlink_osf.c:88 Read of size 2 at addr ffff88804bc64272 by task poc/6431 CPU: 1 PID: 6431 Comm: poc Not tainted 6.0.0-rc4 #1 Call Trace: nf_osf_match_one+0xbed/0xd10 net/netfilter/nfnetlink_osf.c:88 nf_osf_find+0x186/0x2f0 net/netfilter/nfnetlink_osf.c:281 nft_osf_eval+0x37f/0x590 net/netfilter/nft_osf.c:47 expr_call_ops_eval net/netfilter/nf_tables_core.c:214 nft_do_chain+0x2b0/0x1490 net/netfilter/nf_tables_core.c:264 nft_do_chain_ipv4+0x17c/0x1f0 net/netfilter/nft_chain_filter.c:23 [..]
Also add validation to genre, subtype and version fields.
--- net/netfilter/nfnetlink_osf.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/netfilter/nfnetlink_osf.c +8 -0
@@ -316,6 +316,14 @@ static int nfnl_osf_add_callback(struct net *net, struct sock *ctnl, f =nla_data (osf_attrs[OSF_ATTR_FINGER ]); +if (f->opt_num >ARRAY_SIZE (f->opt)) +return -EINVAL ; + +if (!memchr (f->genre,0 ,MAXGENRELEN ) || + !memchr (f->subtype,0 ,MAXGENRELEN ) || + !memchr (f->version,0 ,MAXGENRELEN )) +return -EINVAL ; + kf =kmalloc (sizeof (struct nf_osf_finger ),GFP_KERNEL );if (!kf)return -ENOMEM ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 277/367 net: hns3: fix the port information display when sfp is absent
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yisen Zhuang <[email protected]>
[ Upstream commit 674d9591a32d01df75d6b5fffed4ef942a294376 ]
When sfp is absent or unidentified, the port type should be displayed as PORT_OTHERS, rather than PORT_FIBRE.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +3 -1
@@ -676,7 +676,9 @@ static int hns3_get_link_ksettings(struct net_device *netdev,hns3_get_ksettings (h, cmd);break ;case HNAE3_MEDIA_TYPE_FIBER : -if (module_type ==HNAE3_MODULE_TYPE_CR ) +if (module_type ==HNAE3_MODULE_TYPE_UNKNOWN ) + cmd->base.port =PORT_OTHER ; +else if (module_type ==HNAE3_MODULE_TYPE_CR ) cmd->base.port =PORT_DA ;else cmd->base.port =PORT_FIBRE ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 278/367 sh: boards: Fix CEU buffer size passed to dma_declare_coherent_memory()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Tesarik <[email protected]>
[ Upstream commit fb60211f377b69acffead3147578f86d0092a7a5 ]
In all these cases, the last argument to dma_declare_coherent_memory() is the buffer end address, but the expected value should be the size of the reserved region.
--- arch/sh/boards/mach-ap325rxa/setup.c | 2 +- arch/sh/boards/mach-ecovec24/setup.c | 6 ++---- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 2 +- arch/sh/boards/mach-se/7724/setup.c | 6 ++---- 5 files changed, 7 insertions(+), 11 deletions(-)
arch/sh/boards/mach-ap325rxa/setup.c +1 -1
@@ -529,7 +529,7 @@ static int __init ap325rxa_devices_setup(void)device_initialize (&ap325rxa_ceu_device.dev);dma_declare_coherent_memory (&ap325rxa_ceu_device.dev, ceu_dma_membase, ceu_dma_membase, - ceu_dma_membase +CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (&ap325rxa_ceu_device);
arch/sh/boards/mach-ecovec24/setup.c +2 -4
@@ -1442,15 +1442,13 @@ static int __init arch_setup(void)device_initialize (&ecovec_ceu_devices[0 ]->dev);dma_declare_coherent_memory (&ecovec_ceu_devices[0 ]->dev, ceu0_dma_membase, ceu0_dma_membase, - ceu0_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ecovec_ceu_devices[0 ]);device_initialize (&ecovec_ceu_devices[1 ]->dev);dma_declare_coherent_memory (&ecovec_ceu_devices[1 ]->dev, ceu1_dma_membase, ceu1_dma_membase, - ceu1_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ecovec_ceu_devices[1 ]);gpiod_add_lookup_table (&cn12_power_gpiod_table);
arch/sh/boards/mach-kfr2r09/setup.c +1 -1
@@ -603,7 +603,7 @@ static int __init kfr2r09_devices_setup(void)device_initialize (&kfr2r09_ceu_device.dev);dma_declare_coherent_memory (&kfr2r09_ceu_device.dev, ceu_dma_membase, ceu_dma_membase, - ceu_dma_membase +CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (&kfr2r09_ceu_device);
arch/sh/boards/mach-migor/setup.c +1 -1
@@ -604,7 +604,7 @@ static int __init migor_devices_setup(void)device_initialize (&migor_ceu_device.dev);dma_declare_coherent_memory (&migor_ceu_device.dev, ceu_dma_membase, ceu_dma_membase, - ceu_dma_membase +CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (&migor_ceu_device);
arch/sh/boards/mach-se/7724/setup.c +2 -4
@@ -939,15 +939,13 @@ static int __init devices_setup(void)device_initialize (&ms7724se_ceu_devices[0 ]->dev);dma_declare_coherent_memory (&ms7724se_ceu_devices[0 ]->dev, ceu0_dma_membase, ceu0_dma_membase, - ceu0_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ms7724se_ceu_devices[0 ]);device_initialize (&ms7724se_ceu_devices[1 ]->dev);dma_declare_coherent_memory (&ms7724se_ceu_devices[1 ]->dev, ceu1_dma_membase, ceu1_dma_membase, - ceu1_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ms7724se_ceu_devices[1 ]); return platform_add_devices(ms7724se_devices,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 279/367 ata: sata_gemini: Add missing MODULE_DESCRIPTION
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 8566572bf3b4d6e416a4bf2110dbb4817d11ba59 upstream.
Add the missing MODULE_DESCRIPTION() to avoid warnings such as:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/ata/sata_gemini.o
when compiling with W=1.
--- drivers/ata/sata_gemini.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/sata_gemini.c +1 -0
@@ -435,6 +435,7 @@ static struct platform_driver gemini_sat };module_platform_driver (gemini_sata_driver); +MODULE_DESCRIPTION ("low level driver for Cortina Systems Gemini SATA bridge" );MODULE_AUTHOR ("Linus Walleij <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:" DRV_NAME );
Greg Kroah-Hartman
maintainerPATCH 280/367 ata: pata_ftide010: Add missing MODULE_DESCRIPTION
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 7274eef5729037300f29d14edeb334a47a098f65 upstream.
Add the missing MODULE_DESCRIPTION() to avoid warnings such as:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/ata/pata_ftide010.o
when compiling with W=1.
--- drivers/ata/pata_ftide010.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/pata_ftide010.c +1 -0
@@ -570,6 +570,7 @@ static struct platform_driver pata_ftide };module_platform_driver (pata_ftide010_driver); +MODULE_DESCRIPTION ("low level driver for Faraday Technology FTIDE010" );MODULE_AUTHOR ("Linus Walleij <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:" DRV_NAME );
Greg Kroah-Hartman
maintainerPATCH 281/367 fuse: nlookup missing decrement in fuse_direntplus_link
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: ruanmeisi <[email protected]>
commit b8bd342d50cbf606666488488f9fea374aceb2d5 upstream.
During our debugging of glusterfs, we found an Assertion failed error:inode_lookup >= nlookup, which was caused by the nlookup value in the kernel being greater than that in the FUSE file system.
The issue was introduced by fuse_direntplus_link, where in the function, fuse_iget increments nlookup, and if d_splice_alias returns failure, fuse_direntplus_link returns failure without decrementing nlookup
https://github.com/gluster/glusterfs/pull/4081
--- fs/fuse/readdir.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/fuse/readdir.c +9 -1
@@ -238,8 +238,16 @@ retry:dput (dentry); dentry = alias; } -if (IS_ERR (dentry)) +if (IS_ERR (dentry)) { +if (!IS_ERR (inode)) { +struct fuse_inode *fi =get_fuse_inode (inode); + +spin_lock (&fi->lock); + fi->nlookup--; +spin_unlock (&fi->lock); + }return PTR_ERR (dentry); + } }if (fc->readdirplus_auto)set_bit (FUSE_I_INIT_RDPLUS , &get_fuse_inode (inode)->state);
Greg Kroah-Hartman
maintainerPATCH 282/367 btrfs: dont start transaction when joining with TRANS_JOIN_NOSTART
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 4490e803e1fe9fab8db5025e44e23b55df54078b upstream.
When joining a transaction with TRANS_JOIN_NOSTART, if we don't find a running transaction we end up creating one. This goes against the purpose of TRANS_JOIN_NOSTART which is to join a running transaction if its state is at or below the state TRANS_STATE_COMMIT_START, otherwise return an -ENOENT error and don't start a new transaction. So fix this to not create a new transaction if there's no running transaction at or below that state.
--- fs/btrfs/transaction.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/transaction.c +4 -3
@@ -190,10 +190,11 @@ loop:spin_unlock (&fs_info->trans_lock);/* -* If we are ATTACH, we just want to catch the current transaction, -* and commit it. If there is no transaction, just return ENOENT. +* If we are ATTACH or TRANS_JOIN_NOSTART, we just want to catch the +* current transaction, and commit it. If there is no transaction, just +* return ENOENT. */ -if (type ==TRANS_ATTACH ) +if (type ==TRANS_ATTACH || type ==TRANS_JOIN_NOSTART )return -ENOENT ;/*
Greg Kroah-Hartman
maintainerPATCH 283/367 btrfs: use the correct superblock to compare fsid in btrfs_validate_super
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anand Jain <[email protected]>
commit d167aa76dc0683828588c25767da07fb549e4f48 upstream.
The function btrfs_validate_super() should verify the fsid in the provided superblock argument. Because, all its callers expect it to do that.
Such as in the following stack:
write_all_supers()
sb = fs_info->super_for_commit;
btrfs_validate_write_super(.., sb)
btrfs_validate_super(.., sb, ..) scrub_one_super()
btrfs_validate_super(.., sb, ..)
And
check_dev_super()
btrfs_validate_super(.., sb, ..)
However, it currently verifies the fs_info::super_copy::fsid instead, which is not correct. Fix this using the correct fsid in the superblock argument.
--- fs/btrfs/disk-io.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/btrfs/disk-io.c +2 -3
@@ -2480,11 +2480,10 @@ static int validate_super(struct btrfs_f ret = -EINVAL ; } -if (memcmp (fs_info->fs_devices->fsid, fs_info->super_copy->fsid, -BTRFS_FSID_SIZE )) { +if (memcmp (fs_info->fs_devices->fsid, sb->fsid,BTRFS_FSID_SIZE ) !=0 ) {btrfs_err (fs_info,"superblock fsid doesn't match fsid of fs_devices: %pU != %pU" , - fs_info->super_copy->fsid, fs_info->fs_devices->fsid); + sb->fsid, fs_info->fs_devices->fsid); ret = -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 284/367 mtd: rawnand: brcmnand: Fix crash during the panic_write
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Zhang <[email protected]>
commit e66dd317194daae0475fe9e5577c80aa97f16cb9 upstream.
When executing a NAND command within the panic write path, wait for any pending command instead of calling BUG_ON to avoid crashing while already crashing.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +11 -1
@@ -1331,7 +1331,17 @@ static void brcmnand_send_cmd(struct brcdev_dbg (ctrl->dev,"send native cmd %d addr 0x%llx\n" , cmd, cmd_addr); -BUG_ON (ctrl->cmd_pending !=0 ); +/* +* If we came here through _panic_write and there is a pending +* command, try to wait for it. If it times out, rather than +* hitting BUG_ON, just return so we don't crash while crashing. +*/ +if (oops_in_progress) { +if (ctrl->cmd_pending && +bcmnand_ctrl_poll_status (ctrl,NAND_CTRL_RDY ,NAND_CTRL_RDY ,0 )) +return ; + }else +BUG_ON (ctrl->cmd_pending !=0 ); ctrl->cmd_pending = cmd; ret =bcmnand_ctrl_poll_status (ctrl,NAND_CTRL_RDY ,NAND_CTRL_RDY ,0 );
Greg Kroah-Hartman
maintainerPATCH 285/367 mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Zhang <[email protected]>
commit 5d53244186c9ac58cb88d76a0958ca55b83a15cd upstream.
When the oob buffer length is not in multiple of words, the oob write function does out-of-bounds read on the oob source buffer at the last iteration. Fix that by always checking length limit on the oob buffer read and fill with 0xff when reaching the end of the buffer to the oob registers.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +16 -2
@@ -1273,19 +1273,33 @@ static int write_oob_to_regs(struct brcm const u8 *oob, int sas, int sector_1k) { int tbytes = sas << sector_1k; -int j; +int j, k =0 ; +u32 last =0xffffffff ; +u8 *plast = (u8 *)&last;/* Adjust OOB values for 1K sector size */ if (sector_1k && (i &0x01 )) tbytes =max (0 , tbytes - (int )ctrl->max_oob); tbytes =min_t (int, tbytes, ctrl->max_oob); -for (j =0 ; j < tbytes; j +=4 ) +/* +* tbytes may not be multiple of words. Make sure we don't read out of +* the boundary and stop at last word. +*/ +for (j =0 ; (j +3 ) < tbytes; j +=4 )oob_reg_write (ctrl, j, (oob[j +0 ] <<24 ) | (oob[j +1 ] <<16 ) | (oob[j +2 ] <<8 ) | (oob[j +3 ] <<0 )); + +/* handle the remaing bytes */ +while (j < tbytes) + plast[k++] = oob[j++]; + +if (tbytes &0x3 ) +oob_reg_write (ctrl, (tbytes & ~0x3 ), (__force u32 )cpu_to_be32 (last)); +return tbytes; }
Greg Kroah-Hartman
maintainerPATCH 286/367 mtd: rawnand: brcmnand: Fix potential false time out warning
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Zhang <[email protected]>
commit 9cc0a598b944816f2968baf2631757f22721b996 upstream.
If system is busy during the command status polling function, the driver may not get the chance to poll the status register till the end of time out and return the premature status. Do a final check after time out happens to ensure reading the correct status.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +8 -0
@@ -891,6 +891,14 @@ static int bcmnand_ctrl_poll_status(strucpu_relax (); }while (time_after (limit, jiffies)); +/* +* do a final check after time out in case the CPU was busy and the driver +* did not get enough time to perform the polling to avoid false alarms +*/ + val =brcmnand_read_reg (ctrl,BRCMNAND_INTFC_STATUS ); +if ((val & mask) == expected_val) +return 0 ; +dev_warn (ctrl->dev,"timeout on status poll (expected %x got %x)\n" , expected_val, val & mask);
Greg Kroah-Hartman
maintainerPATCH 287/367 perf hists browser: Fix hierarchy mode header
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
commit e2cabf2a44791f01c21f8d5189b946926e34142e upstream.
The commit ef9ff6017e3c4593 ("perf ui browser: Move the extra title lines from the hists browser") introduced ui_browser__gotorc_title() to help moving non-title lines easily. But it missed to update the title for the hierarchy mode so it won't print the header line on TUI at all.
$ perf report --hierarchy
--- tools/perf/ui/browsers/hists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/browsers/hists.c +1 -1
@@ -1718,7 +1718,7 @@ static void hists_browser__hierarchy_heahists_browser__scnprintf_hierarchy_headers (browser, headers,sizeof (headers)); -ui_browser__gotorc (&browser->b,0 ,0 ); +ui_browser__gotorc_title (&browser->b,0 ,0 );ui_browser__set_color (&browser->b,HE_COLORSET_ROOT );ui_browser__write_nstring (&browser->b, headers, browser->b.width +1 ); }
Greg Kroah-Hartman
maintainerPATCH 288/367 perf tools: Handle old data in PERF_RECORD_ATTR
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
commit 9bf63282ea77a531ea58acb42fb3f40d2d1e4497 upstream.
The PERF_RECORD_ATTR is used for a pipe mode to describe an event with attribute and IDs. The ID table comes after the attr and it calculate size of the table using the total record size and the attr size.
n_ids = (total_record_size - end_of_the_attr_field) / sizeof(u64)
This is fine for most use cases, but sometimes it saves the pipe output in a file and then process it later. And it becomes a problem if there is a change in attr size between the record and report.
$ perf record -o- > perf-pipe.data # old version $ perf report -i- < perf-pipe.data # new version
For example, if the attr size is 128 and it has 4 IDs, then it would save them in 168 byte like below:
8 byte: perf event header { .type = PERF_RECORD_ATTR, .size = 168 },
128 byte: perf event attr { .size = 128, ... },
32 byte: event IDs [] = { 1234, 1235, 1236, 1237 },
But when report later, it thinks the attr size is 136 then it only read the last 3 entries as ID.
8 byte: perf event header { .type = PERF_RECORD_ATTR, .size = 168 },
136 byte: perf event attr { .size = 136, ... },
24 byte: event IDs [] = { 1235, 1236, 1237 }, // 1234 is missing
So it should use the recorded version of the attr. The attr has the size field already then it should honor the size when reading data.
--- tools/perf/util/header.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
tools/perf/util/header.c +6 -5
@@ -3720,7 +3720,8 @@ int perf_event__process_attr(struct perfunion perf_event *event, struct evlist **pevlist) { - u32 i, ids, n_ids; + u32 i, n_ids; +u64 *ids;struct evsel *evsel;struct evlist *evlist = *pevlist;
@@ -3736,9 +3737,8 @@ int perf_event__process_attr(struct perfevlist__add (evlist, evsel); - ids = event->header.size; - ids -= (void *)&event->attr.id - (void *)event; - n_ids = ids /sizeof (u64); + n_ids = event->header.size -sizeof (event->header) - event->attr.attr.size; + n_ids = n_ids /sizeof (u64);/* * We don't have the cpu and thread maps on the header, so * for allocating the perf_sample_id table we fake 1 cpu and
@@ -3747,8 +3747,9 @@ int perf_event__process_attr(struct perfif (perf_evsel__alloc_id (&evsel->core,1 , n_ids))return -ENOMEM ; + ids = (void *)&event->attr.attr + event->attr.attr.size;for (i =0 ; i < n_ids; i++) { -perf_evlist__id_add (&evlist->core, &evsel->core,0 , i, event->attr.id[i]); +perf_evlist__id_add (&evlist->core, &evsel->core,0 , i, ids[i]); }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 289/367 usb: typec: tcpm: Refactor tcpm_handle_vdm_request payload handling
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 8afe9a3548f9d1805dcea6d97978f2179c8403a3 ]
Refactor the tcpm_handle_vdm_request payload handling by doing the endianness conversion only once directly inside tcpm_handle_vdm_request itself instead of doing it multiple times inside various helper functions called by tcpm_handle_vdm_request.
This is a preparation patch for some further refactoring to fix an AB BA lock inversion between the tcpm code and some altmode drivers.
Stable-dep-of: f23643306430 ("usb: typec: bus: verify partner exists in typec_altmode_attention")
--- drivers/usb/typec/tcpm/tcpm.c | 49 ++++++++++++++++------------------- 1 file changed, 22 insertions(+), 27 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +22 -27
@@ -969,16 +969,15 @@ static void tcpm_queue_vdm(struct tcpm_port *port, const u32 header, port->vdm_state =VDM_STATE_READY ; } -static void svdm_consume_identity (struct tcpm_port *port,const __le32 *payload, -int cnt) +static void svdm_consume_identity (struct tcpm_port *port,const u32 *p,int cnt) { -u32 vdo =le32_to_cpu (payload[VDO_INDEX_IDH ]); -u32 product =le32_to_cpu (payload[VDO_INDEX_PRODUCT ]); +u32 vdo = p[VDO_INDEX_IDH ]; +u32 product = p[VDO_INDEX_PRODUCT ];memset (&port->mode_data,0 ,sizeof (port->mode_data)); port->partner_ident.id_header = vdo; - port->partner_ident.cert_stat =le32_to_cpu (payload[VDO_INDEX_CSTAT ]); + port->partner_ident.cert_stat = p[VDO_INDEX_CSTAT ]; port->partner_ident.product = product;typec_partner_set_identity (port->partner);
@@ -988,17 +987,15 @@ static void svdm_consume_identity(struct tcpm_port *port, const __le32 *payload, PD_PRODUCT_PID(product), product & 0xffff); } -static bool svdm_consume_svids (struct tcpm_port *port,const __le32 *payload, -int cnt) +static bool svdm_consume_svids (struct tcpm_port *port,const u32 *p,int cnt) {struct pd_mode_data *pmdata = &port->mode_data;int i;for (i =1 ; i < cnt; i++) { -u32 p =le32_to_cpu (payload[i]);u16 svid; - svid = (p >>16 ) &0xffff ; + svid = (p[i] >>16 ) &0xffff ;if (!svid)return false;
@@ -1008,7 +1005,7 @@ static bool svdm_consume_svids(struct tcpm_port *port, const __le32 *payload, pmdata->svids[pmdata->nsvids++] = svid;tcpm_log (port,"SVID %d: 0x%x" , pmdata->nsvids, svid); - svid = p &0xffff ; + svid = p[i] &0xffff ;if (!svid)return false;
@@ -1038,8 +1035,7 @@ static bool svdm_consume_svids(struct tcpm_port *port, const __le32 *payload,return false; } -static void svdm_consume_modes (struct tcpm_port *port,const __le32 *payload, -int cnt) +static void svdm_consume_modes (struct tcpm_port *port,const u32 *p,int cnt) {struct pd_mode_data *pmdata = &port->mode_data;struct typec_altmode_desc *paltmode;
@@ -1056,7 +1052,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const __le32 *payload, paltmode->svid = pmdata->svids[pmdata->svid_index]; paltmode->mode = i; - paltmode->vdo =le32_to_cpu (payload[i]); + paltmode->vdo = p[i]; tcpm_log(port, " Alternate mode %d: SVID 0x%04x, VDO %d: 0x%08x", pmdata->altmodes, paltmode->svid,
@@ -1084,21 +1080,17 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)#define supports_modal (port) PD_IDH_MODAL_SUPP((port)->partner_ident.id_header) -static int tcpm_pd_svdm (struct tcpm_port *port,const __le32 *payload,int cnt, +static int tcpm_pd_svdm (struct tcpm_port *port,const u32 *p,int cnt,u32 *response) {struct typec_altmode *adev;struct typec_altmode *pdev;struct pd_mode_data *modep; -u32 p[PD_MAX_PAYLOAD ];int rlen =0 ;int cmd_type;int cmd;int i; -for (i =0 ; i < cnt; i++) - p[i] =le32_to_cpu (payload[i]); - cmd_type =PD_VDO_CMDT (p[0 ]); cmd =PD_VDO_CMD (p[0 ]);
@@ -1159,13 +1151,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, const __le32 *payload, int cnt,switch (cmd) {case CMD_DISCOVER_IDENT :/* 6.4.4.3.1 */ -svdm_consume_identity (port, payload, cnt); +svdm_consume_identity (port, p, cnt); response[0 ] =VDO (USB_SID_PD ,1 ,CMD_DISCOVER_SVID ); rlen =1 ;break ;case CMD_DISCOVER_SVID :/* 6.4.4.3.2 */ -if (svdm_consume_svids (port, payload, cnt)) { +if (svdm_consume_svids (port, p, cnt)) { response[0 ] =VDO (USB_SID_PD ,1 ,CMD_DISCOVER_SVID ); rlen =1 ;
@@ -1177,7 +1169,7 @@ static int tcpm_pd_svdm(struct tcpm_port *port, const __le32 *payload, int cnt,break ;case CMD_DISCOVER_MODES :/* 6.4.4.3.3 */ -svdm_consume_modes (port, payload, cnt); +svdm_consume_modes (port, p, cnt); modep->svid_index++;if (modep->svid_index < modep->nsvids) {u16 svid = modep->svids[modep->svid_index];
@@ -1240,15 +1232,18 @@ static int tcpm_pd_svdm(struct tcpm_port *port, const __le32 *payload, int cnt,static void tcpm_handle_vdm_request (struct tcpm_port *port,const __le32 *payload,int cnt) { -int rlen =0 ; +u32 p[PD_MAX_PAYLOAD ];u32 response[8 ] = { }; -u32 p0 =le32_to_cpu (payload[0 ]); +int i, rlen =0 ; + +for (i =0 ; i < cnt; i++) + p[i] =le32_to_cpu (payload[i]);if (port->vdm_state ==VDM_STATE_BUSY ) {/* If UFP responded busy retry after timeout */ -if (PD_VDO_CMDT (p0) ==CMDT_RSP_BUSY ) { +if (PD_VDO_CMDT (p[0 ]) ==CMDT_RSP_BUSY ) { port->vdm_state =VDM_STATE_WAIT_RSP_BUSY ; - port->vdo_retry = (p0 & ~VDO_CMDT_MASK ) | + port->vdo_retry = (p[0 ] & ~VDO_CMDT_MASK ) |CMDT_INIT ;mod_delayed_work (port->wq, &port->vdm_state_machine,msecs_to_jiffies (PD_T_VDM_BUSY ));
@@ -1257,8 +1252,8 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port, port->vdm_state =VDM_STATE_DONE ; } -if (PD_VDO_SVDM (p0)) - rlen =tcpm_pd_svdm (port, payload, cnt, response); +if (PD_VDO_SVDM (p[0 ])) + rlen =tcpm_pd_svdm (port, p, cnt, response);if (rlen >0 ) {tcpm_queue_vdm (port, response[0 ], &response[1 ], rlen -1 );
Signature · 1 line
2.40.1