4.19.249-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 211/234 comedi: vmk80xx: fix expression for tx buffer size
In reply to Greg Kroah-HartmanFrom: Ian Abbott <[email protected]>
commit 242439f7e279d86b3f73b5de724bc67b2f8aeb07 upstream.
The expression for setting the size of the allocated bulk TX buffer (devpriv->usb_tx_buf) is calling usb_endpoint_maxp(devpriv->ep_rx), which is using the wrong endpoint (should be devpriv->ep_tx). Fix it.
--- drivers/staging/comedi/drivers/vmk80xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/comedi/drivers/vmk80xx.c +1 -1
@@ -685,7 +685,7 @@ static int vmk80xx_alloc_usb_buffers(strif (!devpriv->usb_rx_buf)return -ENOMEM ; - size =max (usb_endpoint_maxp (devpriv->ep_rx),MIN_BUF_SIZE ); + size =max (usb_endpoint_maxp (devpriv->ep_tx),MIN_BUF_SIZE ); devpriv->usb_tx_buf =kzalloc (size,GFP_KERNEL );if (!devpriv->usb_tx_buf)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 212/234 USB: serial: option: add support for Cinterion MV31 with new baseline
In reply to Greg Kroah-HartmanFrom: Slark Xiao <[email protected]>
commit 158f7585bfcea4aae0ad4128d032a80fec550df1 upstream.
Adding support for Cinterion device MV31 with Qualcomm new baseline. Use different PIDs to separate it from previous base line products.
All interfaces settings keep same as previous.
Below is test evidence:
T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 6 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=1e2d ProdID=00b8 Rev=04.14 S: Manufacturer=Cinterion S: Product=Cinterion PID 0x00B8 USB Mobile Broadband S: SerialNumber=90418e79 C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option
T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 7 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=1e2d ProdID=00b9 Rev=04.14 S: Manufacturer=Cinterion S: Product=Cinterion PID 0x00B9 USB Mobile Broadband S: SerialNumber=90418e79 C: #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan I: If#=0x1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option I: If#=0x3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option
For PID 00b8, interface 3 is GNSS port which don't use serial driver.
--- drivers/usb/serial/option.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/serial/option.c +6 -0
@@ -432,6 +432,8 @@ static void option_instat_callback(struc#define CINTERION_PRODUCT_CLS8 0x00b0#define CINTERION_PRODUCT_MV31_MBIM 0x00b3#define CINTERION_PRODUCT_MV31_RMNET 0x00b7 +#define CINTERION_PRODUCT_MV31_2_MBIM 0x00b8 +#define CINTERION_PRODUCT_MV31_2_RMNET 0x00b9#define CINTERION_PRODUCT_MV32_WA 0x00f1#define CINTERION_PRODUCT_MV32_WB 0x00f2
@@ -1979,6 +1981,10 @@ static const struct usb_device_id option .driver_info = RSVD(3)}, { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff), .driver_info = RSVD(0)}, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_MBIM, 0xff), + .driver_info = RSVD(3)}, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_RMNET, 0xff), + .driver_info = RSVD(0)}, { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff), .driver_info = RSVD(3)}, { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff),
Greg Kroah-Hartman
maintainerPATCH 213/234 USB: serial: io_ti: add Agilent E5805A support
In reply to Greg Kroah-HartmanFrom: Robert Eckelmann <[email protected]>
commit 908e698f2149c3d6a67d9ae15c75545a3f392559 upstream.
Add support for Agilent E5805A (rebranded ION Edgeport/4) to io_ti.
--- drivers/usb/serial/io_ti.c | 2 ++ drivers/usb/serial/io_usbvend.h | 1 + 2 files changed, 3 insertions(+)
drivers/usb/serial/io_ti.c +2 -0
@@ -168,6 +168,7 @@ static const struct usb_device_id edgepo { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_8S) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416B) }, + { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_E5805A) }, { } };
@@ -206,6 +207,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_8S) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416B) }, + { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_E5805A) }, { } };
drivers/usb/serial/io_usbvend.h +1 -0
@@ -212,6 +212,7 @@// // Definitions for other product IDs #define ION_DEVICE_ID_MT4X56USB 0x1403 // OEM device +#define ION_DEVICE_ID_E5805A 0x1A01 // OEM device (rebranded Edgeport/4)#define GENERATION_ID_FROM_USB_PRODUCT_ID (ProductId) \
Greg Kroah-Hartman
maintainerPATCH 214/234 usb: dwc2: Fix memory leak in dwc2_hcd_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 3755278f078460b021cd0384562977bf2039a57a upstream.
usb_create_hcd will alloc memory for hcd, and we should call usb_put_hcd to free it when platform_get_resource() fails to prevent memory leak.
goto error2 label instead error1 to fix this.
--- drivers/usb/dwc2/hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc2/hcd.c +1 -1
@@ -5236,7 +5236,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) { retval = -EINVAL ; - goto error1; + goto error2; } hcd->rsrc_start = res->start; hcd->rsrc_len =resource_size (res);
Greg Kroah-Hartman
maintainerPATCH 215/234 usb: gadget: lpc32xx_udc: Fix refcount leak in lpc32xx_udc_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 4757c9ade34178b351580133771f510b5ffcf9c8 upstream.
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak. of_node_put() will check NULL pointer.
--- drivers/usb/gadget/udc/lpc32xx_udc.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -0
@@ -3021,6 +3021,7 @@ static int lpc32xx_udc_probe(struct plat } udc->isp1301_i2c_client =isp1301_get_client (isp1301_node); +of_node_put (isp1301_node);if (!udc->isp1301_i2c_client) { retval = -EPROBE_DEFER ; goto phy_fail;
Greg Kroah-Hartman
maintainerPATCH 216/234 serial: 8250: Store to lsr_save_flags after lsr read
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
commit be03b0651ffd8bab69dfd574c6818b446c0753ce upstream.
Not all LSR register flags are preserved across reads. Therefore, LSR readers must store the non-preserved bits into lsr_save_flags.
This fix was initially mixed into feature commit f6f586102add ("serial:
8250: Handle UART without interrupt on TEMT using em485"). However, that feature change had a flaw and it was reverted to make room for simpler approach providing the same feature. The embedded fix got reverted with the feature change.
Re-add the lsr_save_flags fix and properly mark it's a fix.
--- drivers/tty/serial/8250/8250_port.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_port.c +2 -0
@@ -1522,6 +1522,8 @@ static inline void __stop_tx(struct uartif (em485) {unsigned char lsr =serial_in (p,UART_LSR ); + p->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; +/* * To provide required timeing and allow FIFO transfer, * __stop_tx_rs485() must be called only when both FIFO and
Greg Kroah-Hartman
maintainerPATCH 217/234 ext4: fix bug_on ext4_mb_use_inode_pa
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit a08f789d2ab5242c07e716baf9a835725046be89 upstream.
Hulk Robot reported a BUG_ON:
==================================================================
kernel BUG at fs/ext4/mballoc.c:3211!
[...]
RIP: 0010:ext4_mb_mark_diskspace_used.cold+0x85/0x136f [...] Call Trace: ext4_mb_new_blocks+0x9df/0x5d30 ext4_ext_map_blocks+0x1803/0x4d80 ext4_map_blocks+0x3a4/0x1a10 ext4_writepages+0x126d/0x2c30 do_writepages+0x7f/0x1b0 __filemap_fdatawrite_range+0x285/0x3b0 file_write_and_wait_range+0xb1/0x140 ext4_sync_file+0x1aa/0xca0 vfs_fsync_range+0xfb/0x260 do_fsync+0x48/0xa0
[...]
==================================================================
Above issue may happen as follows:
-------------------------------------do_fsync
vfs_fsync_range
ext4_sync_file
file_write_and_wait_range
__filemap_fdatawrite_range
do_writepages
ext4_writepages
mpage_map_and_submit_extent
mpage_map_one_extent
ext4_map_blocks
ext4_mb_new_blocks
ext4_mb_normalize_request
>>> start + size <= ac->ac_o_ex.fe_logical
ext4_mb_regular_allocator
ext4_mb_simple_scan_group
ext4_mb_use_best_found
ext4_mb_new_preallocation
ext4_mb_new_inode_pa
ext4_mb_use_inode_pa
>>> set ac->ac_b_ex.fe_len <= 0
ext4_mb_mark_diskspace_used
>>> BUG_ON(ac->ac_b_ex.fe_len <= 0);we can easily reproduce this problem with the following commands:
`fallocate -l100M disk` `mkfs.ext4 -b 1024 -g 256 disk` `mount disk /mnt` `fsstress -d /mnt -l 0 -n 1000 -p 1`
The size must be smaller than or equal to EXT4_BLOCKS_PER_GROUP. Therefore, "start + size <= ac->ac_o_ex.fe_logical" may occur when the size is truncated. So start should be the start position of the group where ac_o_ex.fe_logical is located after alignment. In addition, when the value of fe_logical or EXT4_BLOCKS_PER_GROUP is very large, the value calculated by start_off is more accurate.
--- fs/ext4/mballoc.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/ext4/mballoc.c +9 -0
@@ -3170,6 +3170,15 @@ ext4_mb_normalize_request(struct ext4_al size = size >> bsbits; start = start_off >> bsbits; +/* +* For tiny groups (smaller than 8MB) the chosen allocation +* alignment may be larger than group size. Make sure the +* alignment does not move allocation to a different group which +* makes mballoc fail assertions later. +*/ + start =max (start,rounddown (ac->ac_o_ex.fe_logical, + (ext4_lblk_t )EXT4_BLOCKS_PER_GROUP (ac->ac_sb))); +/* don't cover already allocated blocks in selected range */ if (ar->pleft && start <= ar->lleft) { size -= ar->lleft +1 - start;
Greg Kroah-Hartman
maintainerPATCH 218/234 ext4: make variable "count" signed
In reply to Greg Kroah-HartmanFrom: Ding Xiang <[email protected]>
commit bc75a6eb856cb1507fa907bf6c1eda91b3fef52f upstream.
Since dx_make_map() may return -EFSCORRUPTED now, so change "count" to be a signed integer so we can correctly check for an error code returned by dx_make_map().
--- fs/ext4/namei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/namei.c +2 -1
@@ -1743,7 +1743,8 @@ static struct ext4_dir_entry_2 *do_split struct dx_hash_info *hinfo) {unsigned blocksize = dir->i_sb->s_blocksize; -unsigned count, continued; +unsigned continued; +int count;struct buffer_head *bh2;ext4_lblk_t newblock;u32 hash2;
Greg Kroah-Hartman
maintainerPATCH 219/234 ext4: add reserved GDT blocks check
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
commit b55c3cd102a6f48b90e61c44f7f3dda8c290c694 upstream.
We capture a NULL pointer issue when resizing a corrupt ext4 image which is freshly clear resize_inode feature (not run e2fsck). It could be simply reproduced by following steps. The problem is because of the resize_inode feature was cleared, and it will convert the filesystem to meta_bg mode in ext4_resize_fs(), but the es->s_reserved_gdt_blocks was not reduced to zero, so could we mistakenly call reserve_backup_gdb() and passing an uninitialized resize_inode to it when adding new group descriptors.
mkfs.ext4 /dev/sda 3G
tune2fs -O ^resize_inode /dev/sda #forget to run requested e2fsck mount /dev/sda /mnt
resize2fs /dev/sda 8G
========
BUG: kernel NULL pointer dereference, address: 0000000000000028 CPU: 19 PID: 3243 Comm: resize2fs Not tainted 5.18.0-rc7-00001-gfde086c5ebfd #748 ... RIP: 0010:ext4_flex_group_add+0xe08/0x2570 ... Call Trace: <TASK> ext4_resize_fs+0xbec/0x1660 __ext4_ioctl+0x1749/0x24e0 ext4_ioctl+0x12/0x20 __x64_sys_ioctl+0xa6/0x110 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f2dd739617b ========
The fix is simple, add a check in ext4_resize_begin() to make sure that the es->s_reserved_gdt_blocks is zero when the resize_inode feature is disabled.
--- fs/ext4/resize.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/ext4/resize.c +10 -0
@@ -53,6 +53,16 @@ int ext4_resize_begin(struct super_blockreturn -EPERM ;/* +* If the reserved GDT blocks is non-zero, the resize_inode feature +* should always be set. +*/ +if (EXT4_SB (sb)->s_es->s_reserved_gdt_blocks && + !ext4_has_feature_resize_inode (sb)) { +ext4_error (sb,"resize_inode disabled but reserved GDT blocks non-zero" ); +return -EFSCORRUPTED ; + } + +/* * If we are not using the primary superblock/GDT copy don't resize, * because the user tools have no way of handling this. Probably a * bad time to do it anyways.
Greg Kroah-Hartman
maintainerPATCH 220/234 virtio-pci: Remove wrong address verification in vp_del_vqs()
In reply to Greg Kroah-HartmanFrom: Murilo Opsfelder Araujo <[email protected]>
commit 7e415282b41bf0d15c6e0fe268f822d9b083f2f7 upstream.
GCC 12 enhanced -Waddress when comparing array address to null [0], which warns:
drivers/virtio/virtio_pci_common.c: In function ‘vp_del_vqs’:
drivers/virtio/virtio_pci_common.c:257:29: warning: the comparison will always evaluate as ‘true’ for the pointer operand in ‘vp_dev->msix_affinity_masks + (sizetype)((long unsigned int)i * 256)’ must not be NULL [-Waddress]
257 | if (vp_dev->msix_affinity_masks[i])
| ^~~~~~In fact, the verification is comparing the result of a pointer arithmetic, the address "msix_affinity_masks + i", which will always evaluate to true.
Under the hood, free_cpumask_var() calls kfree(), which is safe to pass NULL, not requiring non-null verification. So remove the verification to make compiler happy (happy compiler, happy life).
[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102103
Message-Id: <[email protected]>
--- drivers/virtio/virtio_pci_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/virtio/virtio_pci_common.c +1 -2
@@ -257,8 +257,7 @@ void vp_del_vqs(struct virtio_device *vdif (vp_dev->msix_affinity_masks) {for (i =0 ; i < vp_dev->msix_vectors; i++) -if (vp_dev->msix_affinity_masks[i]) -free_cpumask_var (vp_dev->msix_affinity_masks[i]); +free_cpumask_var (vp_dev->msix_affinity_masks[i]); }if (vp_dev->msix_enabled) {
Greg Kroah-Hartman
maintainerPATCH 221/234 net: openvswitch: fix misuse of the cached connection on tuple changes
In reply to Greg Kroah-HartmanFrom: Ilya Maximets <[email protected]>
commit 2061ecfdf2350994e5b61c43e50e98a7a70e95ee upstream.
If packet headers changed, the cached nfct is no longer relevant for the packet and attempt to re-use it leads to the incorrect packet classification.
This issue is causing broken connectivity in OpenStack deployments with OVS/OVN due to hairpin traffic being unexpectedly dropped.
The setup has datapath flows with several conntrack actions and tuple changes between them:
actions:ct(commit,zone=8,mark=0/0x1,nat(src)),
set(eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:06)),
set(ipv4(src=172.18.2.10,dst=192.168.100.6,ttl=62)),
ct(zone=8),recirc(0x4)After the first ct() action the packet headers are almost fully re-written. The next ct() tries to re-use the existing nfct entry and marks the packet as invalid, so it gets dropped later in the pipeline.
Clearing the cached conntrack entry whenever packet tuple is changed to avoid the issue.
The flow key should not be cleared though, because we should still be able to match on the ct_state if the recirculation happens after the tuple change but before the next ct() action.
[Backport to 5.10: minor rebase in ovs_ct_clear function.
This version also applicable to and tested on 5.4 and 4.19.]
--- net/openvswitch/actions.c | 6 ++++++ net/openvswitch/conntrack.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-)
net/openvswitch/actions.c +6 -0
@@ -443,6 +443,7 @@ static void set_ip_addr(struct sk_buff *update_ip_l4_checksum (skb, nh, *addr, new_addr);csum_replace4 (&nh->check, *addr, new_addr);skb_clear_hash (skb); +ovs_ct_clear (skb,NULL ); *addr = new_addr; }
@@ -490,6 +491,7 @@ static void set_ipv6_addr(struct sk_buffupdate_ipv6_checksum (skb, l4_proto, addr, new_addr);skb_clear_hash (skb); +ovs_ct_clear (skb,NULL );memcpy (addr, new_addr,sizeof (__be32[4 ])); }
@@ -730,6 +732,7 @@ static int set_nsh(struct sk_buff *skb,static void set_tp_port (struct sk_buff *skb,__be16 *port,__be16 new_port,__sum16 *check) { +ovs_ct_clear (skb,NULL );inet_proto_csum_replace2 (check, skb, *port, new_port, false); *port = new_port; }
@@ -769,6 +772,7 @@ static int set_udp(struct sk_buff *skb, uh->dest = dst; flow_key->tp.src = src; flow_key->tp.dst = dst; +ovs_ct_clear (skb,NULL ); }skb_clear_hash (skb);
@@ -831,6 +835,8 @@ static int set_sctp(struct sk_buff *skb, sh->checksum = old_csum ^ old_correct_csum ^ new_csum;skb_clear_hash (skb); +ovs_ct_clear (skb,NULL ); + flow_key->tp.src = sh->source; flow_key->tp.dst = sh->dest;
net/openvswitch/conntrack.c +2 -1
@@ -1303,7 +1303,8 @@ int ovs_ct_clear(struct sk_buff *skb, stif (skb_nfct (skb)) {nf_conntrack_put (skb_nfct (skb));nf_ct_set (skb,NULL ,IP_CT_UNTRACKED ); -ovs_ct_fill_key (skb, key); +if (key) +ovs_ct_fill_key (skb, key); }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 222/234 net: openvswitch: fix leak of nested actions
In reply to Greg Kroah-HartmanFrom: Ilya Maximets <[email protected]>
commit 1f30fb9166d4f15a1aa19449b9da871fe0ed4796 upstream.
While parsing user-provided actions, openvswitch module may dynamically allocate memory and store pointers in the internal copy of the actions. So this memory has to be freed while destroying the actions.
Currently there are only two such actions: ct() and set(). However, there are many actions that can hold nested lists of actions and ovs_nla_free_flow_actions() just jumps over them leaking the memory.
For example, removal of the flow with the following actions will lead to a leak of the memory allocated by nf_ct_tmpl_alloc():
actions:clone(ct(commit),0)
Non-freed set() action may also leak the 'dst' structure for the tunnel info including device references.
Under certain conditions with a high rate of flow rotation that may cause significant memory leak problem (2MB per second in reporter's case). The problem is also hard to mitigate, because the user doesn't have direct control over the datapath flows generated by OVS.
Fix that by iterating over all the nested actions and freeing everything that needs to be freed recursively.
New build time assertion should protect us from this problem if new actions will be added in the future.
Unfortunately, openvswitch module doesn't use NLA_F_NESTED, so all attributes has to be explicitly checked. sample() and clone() actions are mixing extra attributes into the user-provided action list. That prevents some code generalization too.
[Backport for 4.19: Removed handling of OVS_ACTION_ATTR_DEC_TTL
and OVS_ACTION_ATTR_CHECK_PKT_LEN as these actions do not exist in this version. BUILD_BUG_ON condition adjusted accordingly.]
--- net/openvswitch/flow_netlink.c | 61 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-)
net/openvswitch/flow_netlink.c +56 -5
@@ -2253,6 +2253,36 @@ static struct sw_flow_actions *nla_allocreturn sfa; } +static void ovs_nla_free_nested_actions (const struct nlattr *actions,int len); + +static void ovs_nla_free_clone_action (const struct nlattr *action) +{ +const struct nlattr *a =nla_data (action); +int rem =nla_len (action); + +switch (nla_type (a)) { +case OVS_CLONE_ATTR_EXEC : +/* The real list of actions follows this attribute. */ + a =nla_next (a, &rem); +ovs_nla_free_nested_actions (a, rem); +break ; + } +} + +static void ovs_nla_free_sample_action (const struct nlattr *action) +{ +const struct nlattr *a =nla_data (action); +int rem =nla_len (action); + +switch (nla_type (a)) { +case OVS_SAMPLE_ATTR_ARG : +/* The real list of actions follows this attribute. */ + a =nla_next (a, &rem); +ovs_nla_free_nested_actions (a, rem); +break ; + } +} +static void ovs_nla_free_set_action (const struct nlattr *a) {const struct nlattr *ovs_key =nla_data (a);
@@ -2266,25 +2296,46 @@ static void ovs_nla_free_set_action(cons } } -void ovs_nla_free_flow_actions (struct sw_flow_actions *sf_acts) +static void ovs_nla_free_nested_actions (const struct nlattr *actions,int len) {const struct nlattr *a;int rem; -if (!sf_acts) +/* Whenever new actions are added, the need to update this +* function should be considered. +*/ +BUILD_BUG_ON (OVS_ACTION_ATTR_MAX !=20 ); + +if (!actions)return ; -nla_for_each_attr (a, sf_acts->actions, sf_acts->actions_len, rem) { +nla_for_each_attr (a, actions, len, rem) {switch (nla_type (a)) { -case OVS_ACTION_ATTR_SET : -ovs_nla_free_set_action (a); +case OVS_ACTION_ATTR_CLONE : +ovs_nla_free_clone_action (a);break ; +case OVS_ACTION_ATTR_CT :ovs_ct_free_action (a);break ; + +case OVS_ACTION_ATTR_SAMPLE : +ovs_nla_free_sample_action (a); +break ; + +case OVS_ACTION_ATTR_SET : +ovs_nla_free_set_action (a); +break ; } } +} + +void ovs_nla_free_flow_actions (struct sw_flow_actions *sf_acts) +{ +if (!sf_acts) +return ; +ovs_nla_free_nested_actions (sf_acts->actions, sf_acts->actions_len);kfree (sf_acts); }
Greg Kroah-Hartman
maintainerPATCH 223/234 RISC-V: fix barrier() use in <vdso/processor.h>
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 30aca1bacb398dec6c1ed5eeca33f355bd7b6203 upstream.
riscv's <vdso/processor.h> uses barrier() so it should include <asm/barrier.h>
Fixes this build error:
CC [M] drivers/net/ethernet/emulex/benet/be_main.o
In file included from ./include/vdso/processor.h:10,
from ./arch/riscv/include/asm/processor.h:11,
from ./include/linux/prefetch.h:15,
from drivers/net/ethernet/emulex/benet/be_main.c:14:./arch/riscv/include/asm/vdso/processor.h: In function 'cpu_relax':./arch/riscv/include/asm/vdso/processor.h:14:2: error: implicit declaration of function 'barrier' [-Werror=implicit-function-declaration]
14 | barrier();
This happens with a total of 5 networking drivers -- they all use <linux/prefetch.h>.
rv64 allmodconfig now builds cleanly after this patch.
Fixes fallout from:815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive")
--- arch/riscv/include/asm/processor.h | 2 ++ 1 file changed, 2 insertions(+)
arch/riscv/include/asm/processor.h +2 -0
@@ -30,6 +30,8 @@#ifndef __ASSEMBLY__ +#include <asm/barrier.h> +struct task_struct ;struct pt_regs ;
Greg Kroah-Hartman
maintainerPATCH 224/234 powerpc/mm: Switch obsolete dssall to .long
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
commit d51f86cfd8e378d4907958db77da3074f6dce3ba upstream.
The dssall ("Data Stream Stop All") instruction is obsolete altogether with other Data Cache Instructions since ISA 2.03 (year 2006).
LLVM IAS does not support it but PPC970 seems to be using it. This switches dssall to .long as there is no much point in fixing LLVM.
--- arch/powerpc/include/asm/ppc-opcode.h | 2 ++ arch/powerpc/kernel/idle_6xx.S | 2 +- arch/powerpc/kernel/l2cr_6xx.S | 6 +++--- arch/powerpc/kernel/swsusp_32.S | 2 +- arch/powerpc/kernel/swsusp_asm64.S | 2 +- arch/powerpc/mm/mmu_context.c | 2 +- arch/powerpc/platforms/powermac/cache.S | 4 ++-- 7 files changed, 11 insertions(+), 9 deletions(-)
arch/powerpc/include/asm/ppc-opcode.h +2 -0
@@ -207,6 +207,7 @@#define PPC_INST_ICBT 0x7c00002c#define PPC_INST_ICSWX 0x7c00032d#define PPC_INST_ICSWEPX 0x7c00076d +#define PPC_INST_DSSALL 0x7e00066c#define PPC_INST_ISEL 0x7c00001e#define PPC_INST_ISEL_MASK 0xfc00003e#define PPC_INST_LDARX 0x7c0000a8
@@ -424,6 +425,7 @@ __PPC_RA(a) | __PPC_RB(b))#define PPC_DCBZL (a, b) stringify_in_c(.long PPC_INST_DCBZL | \ __PPC_RA(a) | __PPC_RB(b)) +#define PPC_DSSALL stringify_in_c(.long PPC_INST_DSSALL)#define PPC_LQARX (t, a, b, eh) stringify_in_c(.long PPC_INST_LQARX | \ ___PPC_RT(t) | ___PPC_RA(a) | \ ___PPC_RB(b) | __PPC_EH(eh))
arch/powerpc/kernel/idle_6xx.S +1 -1
@@ -133,7 +133,7 @@ BEGIN_FTR_SECTION END_FTR_SECTION_IFCLR(CPU_FTR_NO_DPM) mtspr SPRN_HID0,r4 BEGIN_FTR_SECTION - DSSALL + PPC_DSSALL sync END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) CURRENT_THREAD_INFO(r9, r1)
arch/powerpc/kernel/l2cr_6xx.S +3 -3
@@ -108,7 +108,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_L2CR) /* Stop DST streams */ BEGIN_FTR_SECTION - DSSALL + PPC_DSSALL sync END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
@@ -305,7 +305,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_L3CR) isync /* Stop DST streams */ - DSSALL + PPC_DSSALL sync /* Get the current enable bit of the L3CR into r4 */
@@ -414,7 +414,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_L3CR) _GLOBAL(__flush_disable_L1) /* Stop pending alitvec streams and memory accesses */ BEGIN_FTR_SECTION - DSSALL + PPC_DSSALL END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) sync
arch/powerpc/kernel/swsusp_32.S +1 -1
@@ -181,7 +181,7 @@ _GLOBAL(swsusp_arch_resume) #ifdef CONFIG_ALTIVEC /* Stop pending alitvec streams and memory accesses */ BEGIN_FTR_SECTION - DSSALL + PPC_DSSALL END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) #endif sync
arch/powerpc/kernel/swsusp_asm64.S +1 -1
@@ -143,7 +143,7 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_LPAR _GLOBAL(swsusp_arch_resume) /* Stop pending alitvec streams and memory accesses */ BEGIN_FTR_SECTION - DSSALL + PPC_DSSALL END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) sync
arch/powerpc/mm/mmu_context.c +1 -1
@@ -83,7 +83,7 @@ void switch_mm_irqs_off(struct mm_struct* context */ if (cpu_has_feature (CPU_FTR_ALTIVEC )) - asmvolatile ("dssall" ); + asm volatile (PPC_DSSALL);if (new_on_cpu)radix_kvm_prefetch_workaround (next);
arch/powerpc/platforms/powermac/cache.S +2 -2
@@ -53,7 +53,7 @@ flush_disable_75x: /* Stop DST streams */ BEGIN_FTR_SECTION - DSSALL + PPC_DSSALL sync END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
@@ -201,7 +201,7 @@ flush_disable_745x: isync /* Stop prefetch streams */ - DSSALL + PPC_DSSALL sync /* Disable L2 prefetching */
Greg Kroah-Hartman
maintainerPATCH 225/234 s390/mm: use non-quiescing sske for KVM switch to keyed guest
In reply to Greg Kroah-HartmanFrom: Christian Borntraeger <[email protected]>
commit 3ae11dbcfac906a8c3a480e98660a823130dc16a upstream.
The switch to a keyed guest does not require a classic sske as the other guest CPUs are not accessing the key before the switch is complete. By using the NQ SSKE things are faster especially with multiple guests.
--- arch/s390/mm/pgtable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/mm/pgtable.c +1 -1
@@ -716,7 +716,7 @@ void ptep_zap_key(struct mm_struct *mm,pgste_val (pgste) |=PGSTE_GR_BIT |PGSTE_GC_BIT ; ptev =pte_val (*ptep);if (!(ptev & _PAGE_INVALID) && (ptev & _PAGE_WRITE)) -page_set_storage_key (ptev &PAGE_MASK ,PAGE_DEFAULT_KEY ,1 ); +page_set_storage_key (ptev &PAGE_MASK ,PAGE_DEFAULT_KEY ,0 );pgste_set_unlock (ptep, pgste);preempt_enable (); }
Greg Kroah-Hartman
maintainerPATCH 226/234 usb: gadget: u_ether: fix regression in setting fixed MAC address
In reply to Greg Kroah-HartmanFrom: Marian Postevca <[email protected]>
commit b337af3a4d6147000b7ca6b3438bf5c820849b37 upstream.
In systemd systems setting a fixed MAC address through the "dev_addr" module argument fails systematically. When checking the MAC address after the interface is created it always has the same but different MAC address to the one supplied as argument.
This is partially caused by systemd which by default will set an internally generated permanent MAC address for interfaces that are marked as having a randomly generated address.
Commit 890d5b40908bfd1a ("usb: gadget: u_ether: fix race in setting MAC address in setup phase") didn't take into account the fact that the interface must be marked as having a set MAC address when it's set as module argument.
Fixed by marking the interface with NET_ADDR_SET when the "dev_addr" module argument is supplied.
--- drivers/usb/gadget/function/u_ether.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/u_ether.c +9 -2
@@ -772,9 +772,13 @@ struct eth_dev *gether_setup_name(struct dev->qmult = qmult;snprintf (net->name,sizeof (net->name),"%s%%d" , netname); -if (get_ether_addr (dev_addr, net->dev_addr)) +if (get_ether_addr (dev_addr, net->dev_addr)) { + net->addr_assign_type =NET_ADDR_RANDOM ;dev_warn (&g->dev,"using random %s ethernet address\n" ,"self" ); + }else { + net->addr_assign_type =NET_ADDR_SET ; + }if (get_ether_addr (host_addr, dev->host_mac))dev_warn (&g->dev,"using random %s ethernet address\n" ,"host" );
@@ -831,6 +835,9 @@ struct net_device *gether_setup_name_defINIT_LIST_HEAD (&dev->tx_reqs);INIT_LIST_HEAD (&dev->rx_reqs); +/* by default we always have a random MAC address */ + net->addr_assign_type =NET_ADDR_RANDOM ; +skb_queue_head_init (&dev->rx_frames);/* network device setup */
@@ -868,7 +875,6 @@ int gether_register_netdev(struct net_de g = dev->gadget;memcpy (net->dev_addr, dev->dev_mac,ETH_ALEN ); - net->addr_assign_type =NET_ADDR_RANDOM ; status =register_netdev (net);if (status <0 ) {
@@ -908,6 +914,7 @@ int gether_set_dev_addr(struct net_devicif (get_ether_addr (dev_addr, new_addr))return -EINVAL ;memcpy (dev->dev_mac, new_addr,ETH_ALEN ); + net->addr_assign_type =NET_ADDR_SET ;return 0 ; }EXPORT_SYMBOL_GPL (gether_set_dev_addr);
Greg Kroah-Hartman
maintainerPATCH 227/234 xprtrdma: fix incorrect header size calculations
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 912288442cb2f431bf3c8cb097a5de83bc6dbac1 upstream.
Currently the header size calculations are using an assignment operator instead of a += operator when accumulating the header size leading to incorrect sizes. Fix this by using the correct operator.
Addresses-Coverity: ("Unused value")
--- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/xprtrdma/rpc_rdma.c +2 -2
@@ -72,7 +72,7 @@ static unsigned int rpcrdma_max_call_hea/* Maximum Read list size */ maxsegs +=2 ;/* segment for head and tail buffers */ - size = maxsegs * rpcrdma_readchunk_maxsz *sizeof (__be32); + size += maxsegs * rpcrdma_readchunk_maxsz *sizeof (__be32);/* Minimal Read chunk size */ size +=sizeof (__be32);/* segment count */
@@ -98,7 +98,7 @@ static unsigned int rpcrdma_max_reply_he/* Maximum Write list size */ maxsegs +=2 ;/* segment for head and tail buffers */ - size =sizeof (__be32);/* segment count */ + size +=sizeof (__be32);/* segment count */ size += maxsegs * rpcrdma_segment_maxsz *sizeof (__be32); size +=sizeof (__be32);/* list discriminator */
Greg Kroah-Hartman
maintainerPATCH 228/234 tcp: add some entropy in __inet_hash_connect()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit c579bd1b4021c42ae247108f1e6f73dd3f08600c upstream.
Even when implementing RFC 6056 3.3.4 (Algorithm 4: Double-Hash Port Selection Algorithm), a patient attacker could still be able to collect enough state from an otherwise idle host.
Idea of this patch is to inject some noise, in the cases __inet_hash_connect() found a candidate in the first attempt.
This noise should not significantly reduce the collision avoidance, and should be zero if connection table is already well used.
Note that this is not implementing RFC 6056 3.3.5
because we think Algorithm 5 could hurt typical
workloads.
--- net/ipv4/inet_hashtables.c | 5 +++++ 1 file changed, 5 insertions(+)
net/ipv4/inet_hashtables.c +5 -0
@@ -821,6 +821,11 @@ next_port:return -EADDRNOTAVAIL ; ok: +/* If our first attempt found a candidate, skip next candidate +* in 1/16 of cases to add some noise. +*/ +if (!i && !(prandom_u32 () %16 )) + i =2 ;WRITE_ONCE (table_perturb[index],READ_ONCE (table_perturb[index]) + i +2 );/* Head lock still held and bh's disabled */
Greg Kroah-Hartman
maintainerPATCH 229/234 tcp: use different parts of the port_offset for index and offset
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit 9e9b70ae923baf2b5e8a0ea4fd0c8451801ac526 upstream.
Amit Klein suggests that we use different parts of port_offset for the table's index and the port offset so that there is no direct relation between them.
--- net/ipv4/inet_hashtables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/inet_hashtables.c +1 -1
@@ -766,7 +766,7 @@ int __inet_hash_connect(struct inet_timenet_get_random_once (table_perturb,sizeof (table_perturb)); index =hash_32 (port_offset,INET_TABLE_PERTURB_SHIFT ); - offset =READ_ONCE (table_perturb[index]) + port_offset; + offset =READ_ONCE (table_perturb[index]) + (port_offset >>32 ); offset %= remaining;/* In first pass we try ports of @low parity.
Greg Kroah-Hartman
maintainerPATCH 230/234 tcp: add small random increments to the source port
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit ca7af0402550f9a0b3316d5f1c30904e42ed257d upstream.
Here we're randomly adding between 0 and 7 random increments to the selected source port in order to add some noise in the source port selection that will make the next port less predictable.
With the default port range of 32768-60999 this means a worst case reuse scenario of 14116/8=1764 connections between two consecutive uses of the same port, with an average of 14116/4.5=3137. This code was stressed at more than 800000 connections per second to a fixed target with all connections closed by the client using RSTs (worst condition) and only 2 connections failed among 13 billion, despite the hash being reseeded every 10 seconds, indicating a perfectly safe situation.
--- net/ipv4/inet_hashtables.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/ipv4/inet_hashtables.c +5 -4
@@ -821,11 +821,12 @@ next_port:return -EADDRNOTAVAIL ; ok: -/* If our first attempt found a candidate, skip next candidate -* in 1/16 of cases to add some noise. +/* Here we want to add a little bit of randomness to the next source +* port that will be chosen. We use a max() with a random here so that +* on low contention the randomness is maximal and on high contention +* it may be inexistent. */ -if (!i && !(prandom_u32 () %16 )) - i =2 ; + i =max_t (int, i, (prandom_u32 () &7 ) *2 );WRITE_ONCE (table_perturb[index],READ_ONCE (table_perturb[index]) + i +2 );/* Head lock still held and bh's disabled */
Greg Kroah-Hartman
maintainerPATCH 231/234 tcp: dynamically allocate the perturb table used by source ports
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit e9261476184be1abd486c9434164b2acbe0ed6c2 upstream.
We'll need to further increase the size of this table and it's likely that at some point its size will not be suitable anymore for a static table. Let's allocate it on boot from inet_hashinfo2_init(), which is called from tcp_init().
--- net/ipv4/inet_hashtables.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/ipv4/inet_hashtables.c +10 -2
@@ -723,7 +723,8 @@ EXPORT_SYMBOL_GPL(inet_unhash);* privacy, this only consumes 1 KB of kernel memory. */ #define INET_TABLE_PERTURB_SHIFT 8 -static u32 table_perturb[1 <<INET_TABLE_PERTURB_SHIFT ]; +#define INET_TABLE_PERTURB_SIZE (1 << INET_TABLE_PERTURB_SHIFT) +static u32 *table_perturb; int __inet_hash_connect(struct inet_timewait_death_row *death_row, struct sock *sk, u64 port_offset,
@@ -763,7 +764,8 @@ int __inet_hash_connect(struct inet_timeif (likely (remaining >1 )) remaining &= ~1U ; -net_get_random_once (table_perturb,sizeof (table_perturb)); +net_get_random_once (table_perturb, +INET_TABLE_PERTURB_SIZE *sizeof (*table_perturb)); index =hash_32 (port_offset,INET_TABLE_PERTURB_SHIFT ); offset =READ_ONCE (table_perturb[index]) + (port_offset >>32 );
@@ -896,6 +898,12 @@ void __init inet_hashinfo2_init(struct iINIT_HLIST_HEAD (&h->lhash2[i].head); h->lhash2[i].count =0 ; } + +/* this one is used for source ports of outgoing connections */ + table_perturb =kmalloc_array (INET_TABLE_PERTURB_SIZE , +sizeof (*table_perturb),GFP_KERNEL ); +if (!table_perturb) +panic ("TCP: failed to alloc table_perturb" ); }int inet_ehash_locks_alloc (struct inet_hashinfo *hashinfo)
Greg Kroah-Hartman
maintainerPATCH 232/234 tcp: increase source port perturb table to 2^16
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit 4c2c8f03a5ab7cb04ec64724d7d176d00bcc91e5 upstream.
Moshe Kol, Amit Klein, and Yossi Gilad reported being able to accurately identify a client by forcing it to emit only 40 times more connections than there are entries in the table_perturb[] table. The previous two improvements consisting in resalting the secret every 10s and adding randomness to each port selection only slightly improved the situation, and the current value of 2^8 was too small as it's not very difficult to make a client emit 10k connections in less than 10 seconds.
Thus we're increasing the perturb table from 2^8 to 2^16 so that the same precision now requires 2.6M connections, which is more difficult in this time frame and harder to hide as a background activity. The impact is that the table now uses 256 kB instead of 1 kB, which could mostly affect devices making frequent outgoing connections. However such components usually target a small set of destinations (load balancers, database clients, perf assessment tools), and in practice only a few entries will be visited, like before.
A live test at 1 million connections per second showed no performance difference from the previous value.
--- net/ipv4/inet_hashtables.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/ipv4/inet_hashtables.c +5 -4
@@ -718,11 +718,12 @@ EXPORT_SYMBOL_GPL(inet_unhash);* Note that we use 32bit integers (vs RFC 'short integers') * because 2^16 is not a multiple of num_ephemeral and this * property might be used by clever attacker. -* RFC claims using TABLE_LENGTH=10 buckets gives an improvement, -* we use 256 instead to really give more isolation and -* privacy, this only consumes 1 KB of kernel memory. +* RFC claims using TABLE_LENGTH=10 buckets gives an improvement, though +* attacks were since demonstrated, thus we use 65536 instead to really +* give more isolation and privacy, at the expense of 256kB of kernel +* memory. */ -#define INET_TABLE_PERTURB_SHIFT 8 +#define INET_TABLE_PERTURB_SHIFT 16#define INET_TABLE_PERTURB_SIZE (1 << INET_TABLE_PERTURB_SHIFT)static u32 *table_perturb;
Greg Kroah-Hartman
maintainerPATCH 233/234 tcp: drop the hash_32() part from the index calculation
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit e8161345ddbb66e449abde10d2fdce93f867eba9 upstream.
In commit 190cc82489f4 ("tcp: change source port randomizarion at connect() time"), the table_perturb[] array was introduced and an index was taken from the port_offset via hash_32(). But it turns out that hash_32() performs a multiplication while the input here comes from the output of SipHash in secure_seq, that is well distributed enough to avoid the need for yet another hash.
--- net/ipv4/inet_hashtables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/inet_hashtables.c +1 -1
@@ -767,7 +767,7 @@ int __inet_hash_connect(struct inet_timenet_get_random_once (table_perturb,INET_TABLE_PERTURB_SIZE *sizeof (*table_perturb)); - index =hash_32 (port_offset,INET_TABLE_PERTURB_SHIFT ); + index = port_offset & (INET_TABLE_PERTURB_SIZE -1 ); offset =READ_ONCE (table_perturb[index]) + (port_offset >>32 ); offset %= remaining;
Greg Kroah-Hartman
maintainerPATCH 234/234 Revert "hwmon: Make chip parameter for with_info API mandatory"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
This reverts commit 1ec0bc72f5dab3ab367ae5230cf6f212d805a225 which is commit ddaefa209c4ac791c1262e97c9b2d0440c8ef1d5 upstream. It should not have been applied to the stable trees.
--- Documentation/hwmon/hwmon-kernel-api.txt | 2 +- drivers/hwmon/hwmon.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-)
Documentation/hwmon/hwmon-kernel-api.txt +1 -1
@@ -71,7 +71,7 @@ hwmon_device_register_with_info is the m to register a hardware monitoring device. It creates the standard sysfs attributes in the hardware monitoring core, letting the driver focus on reading from and writing to the chip instead of having to bother with sysfs attributes. -The parent device parameter as well as the chip parameter must not be NULL. Its +The parent device parameter cannot be NULL with non-NULL chip info. Its parameters are described in more detail below. devm_hwmon_device_register_with_info is similar to
drivers/hwmon/hwmon.c +9 -7
@@ -695,12 +695,11 @@ EXPORT_SYMBOL_GPL(hwmon_device_register_/** * hwmon_device_register_with_info - register w/ hwmon -* @dev: the parent device (mandatory) -* @name: hwmon name attribute (mandatory) -* @drvdata: driver data to attach to created device (optional) -* @chip: pointer to hwmon chip information (mandatory) +* @dev: the parent device +* @name: hwmon name attribute +* @drvdata: driver data to attach to created device +* @chip: pointer to hwmon chip information * @extra_groups: pointer to list of additional non-standard attribute groups -* (optional) * * hwmon_device_unregister() must be called when the device is no * longer needed.
@@ -713,10 +712,13 @@ hwmon_device_register_with_info(struct d const struct hwmon_chip_info *chip, const struct attribute_group **extra_groups) { - if (!dev || !name || !chip) + if (!name) return ERR_PTR(-EINVAL); -if (!chip->ops || !chip->ops->is_visible || !chip->info) +if (chip && (!chip->ops || !chip->ops->is_visible || !chip->info)) +return ERR_PTR (-EINVAL ); + +if (chip && !dev)return ERR_PTR (-EINVAL );return __hwmon_device_register (dev, name, drvdata, chip, extra_groups);
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 4.19.249 release. There are 234 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-4.19.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.249 release. There are 234 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 25 Jun 2022 16:43:11 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.249-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.249 release. There are 234 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 25 Jun 2022 16:43:11 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.249-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Tested on arm64 and x86 for 4.19.249-rc1,
Kernel repo:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Branch: linux-4.19.y
Version: 4.19.249-rc1
Commit: c68bb5c7d26a776d27329893aac58340cb536420
Compiler: gcc version 7.3.0 (GCC)
arm64:
--------------------------------------------------------------------
Testcase Result Summary:
total: 9009
passed: 9009
failed: 0
timeout: 0
--------------------------------------------------------------------
x86:
--------------------------------------------------------------------
Testcase Result Summary:
total: 9009
passed: 9009
failed: 0
timeout: 0
--------------------------------------------------------------------
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.249 release. There are 234 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 25 Jun 2022 16:43:11 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.249-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v4.19:
10 builds: 10 pass, 0 fail
22 boots: 22 pass, 0 fail
40 tests: 40 pass, 0 failLinux version: 4.19.249-rc1-g55129f567572
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Jon
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.249 release. There are 234 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 25 Jun 2022 16:43:11 +0000. Anything received after that time might be too late.
Build test (gcc version 11.3.1 20220621):
mips: 63 configs -> no failure
arm: 115 configs -> no failure
arm64: 2 configs -> no failurex86_64: 4 configs -> no failure
alpha allmodconfig -> no failure
powerpc allmodconfig -> no failure
riscv allmodconfig -> no failure
s390 allmodconfig -> no failure
xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
[1]. https://openqa.qa.codethink.co.uk/tests/1383
--
Regards
Sudip
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.249 release. There are 234 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 25 Jun 2022 16:43:11 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 425 pass: 425 fail: 0
Guenter
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.249 release. There are 234 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 25 Jun 2022 16:43:11 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.249-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 4.19.249-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-4.19.y
* git commit: 55129f5675729c290523b53fe49c144a07ad70c9
* git describe: v4.19.248-235-g55129f567572
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-4.19.y/build/v4.19.248-235-g55129f567572
## Test Regressions (compared to v4.19.248-227-gc68bb5c7d26a) No test regressions found.
## Metric Regressions (compared to v4.19.248-227-gc68bb5c7d26a) No metric regressions found.
## Test Fixes (compared to v4.19.248-227-gc68bb5c7d26a) No test fixes found.
## Metric Fixes (compared to v4.19.248-227-gc68bb5c7d26a) No metric fixes found.
## Test result summary
total: 111187, pass: 98232, fail: 248, skip: 11338, xfail: 1369
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 298 total, 292 passed, 6 failed
* arm64: 56 total, 54 passed, 2 failed
* i386: 27 total, 23 passed, 4 failed
* mips: 27 total, 27 passed, 0 failed
* parisc: 12 total, 12 passed, 0 failed
* powerpc: 55 total, 54 passed, 1 failed
* s390: 12 total, 12 passed, 0 failed
* sh: 24 total, 24 passed, 0 failed
* sparc: 12 total, 12 passed, 0 failed
* x86_64: 53 total, 51 passed, 2 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kunit
* kvm-unit-tests
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-cap_bounds-tests
* ltp-commands
* ltp-commands-tests
* ltp-containers
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests
* ltp-fcntl-locktests-tests
* ltp-filecaps
* ltp-filecaps-tests
* ltp-fs
* ltp-fs-tests
* ltp-fs_bind
* ltp-fs_bind-tests
* ltp-fs_perms_simple
* ltp-fs_perms_simple-tests
* ltp-fsx
* ltp-fsx-tests
* ltp-hugetlb
* ltp-hugetlb-tests
* ltp-io
* ltp-io-tests
* ltp-ipc
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty
* ltp-pty-tests
* ltp-sched
* ltp-sched-tests
* ltp-securebits
* ltp-securebits-tests
* ltp-smoke
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* rcutorture
* ssuite
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org