5.4.229-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 140/658 bpf: Move skb->len == 0 checks into __bpf_redirect
In reply to Greg Kroah-HartmanFrom: Stanislav Fomichev <[email protected]>
[ Upstream commit 114039b342014680911c35bd6b72624180fd669a ]
To avoid potentially breaking existing users.
Both mac/no-mac cases have to be amended; mac_header >= network_header is not enough (verified with a new test, see next patch).
--- net/bpf/test_run.c | 3 --- net/core/filter.c | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-)
net/bpf/test_run.c +0 -3
@@ -201,9 +201,6 @@ static int convert___skb_to_skb(struct sk_buff *skb, struct __sk_buff *__skb) {struct qdisc_skb_cb *cb = (struct qdisc_skb_cb *)skb->cb; -if (!skb->len) -return -EINVAL ; -if (!__skb)return 0 ;
net/core/filter.c +6 -1
@@ -2071,6 +2071,11 @@ static int __bpf_redirect_no_mac(struct sk_buff *skb, struct net_device *dev, {unsigned int mlen =skb_network_offset (skb); +if (unlikely (skb->len <= mlen)) { +kfree_skb (skb); +return -ERANGE ; + } +if (mlen) {__skb_pull (skb, mlen);
@@ -2092,7 +2097,7 @@ static int __bpf_redirect_common(struct sk_buff *skb, struct net_device *dev, u32 flags) {/* Verify that a link layer header is carried */ -if (unlikely (skb->mac_header >= skb->network_header)) { +if (unlikely (skb->mac_header >= skb->network_header || skb->len ==0 )) {kfree_skb (skb);return -ERANGE ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 141/658 HID: hid-sensor-custom: set fixed size for custom attributes
In reply to Greg Kroah-HartmanFrom: Marcus Folkesson <[email protected]>
[ Upstream commit 9d013910df22de91333a0acc81d1dbb115bd76f6 ]
This is no bugfix (so no Fixes: tag is necessary) as it is taken care of in hid_sensor_custom_add_attributes().
The motivation for this patch is that:
hid_sensor_custom_field.attr_name and hid_sensor_custom_field.attrs
has the size of HID_CUSTOM_TOTAL_ATTRS and used in same context.
We compare against HID_CUSTOM_TOTAL_ATTRS when
looping through hid_custom_attrs.
We will silent the smatch error:hid_sensor_custom_add_attributes() error: buffer overflow 'hid_custom_attrs' 8 <= 10
--- drivers/hid/hid-sensor-custom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-sensor-custom.c +1 -1
@@ -59,7 +59,7 @@ struct hid_sensor_sample {u32 raw_len; } __packed; -static struct attribute hid_custom_attrs[] = { +static struct attribute hid_custom_attrs[HID_CUSTOM_TOTAL_ATTRS ] = { {.name ="name" , .mode =S_IRUGO }, {.name ="units" , .mode =S_IRUGO }, {.name ="unit-expo" , .mode =S_IRUGO },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 142/658 ALSA: pcm: fix undefined behavior in bit shift for SNDRV_PCM_RATE_KNOT
In reply to Greg Kroah-HartmanFrom: Baisong Zhong <[email protected]>
[ Upstream commit b5172e62458f8e6ff359e5f096044a488db90ac5 ]
Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below:
UBSAN: shift-out-of-bounds in sound/core/pcm_native.c:2676:21 left shift of 1 by 31 places cannot be represented in type 'int' ... Call Trace: <TASK> dump_stack_lvl+0x8d/0xcf ubsan_epilogue+0xa/0x44 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 snd_pcm_open_substream+0x9f0/0xa90 snd_pcm_oss_open.part.26+0x313/0x670 snd_pcm_oss_open+0x30/0x40 soundcore_open+0x18b/0x2e0 chrdev_open+0xe2/0x270 do_dentry_open+0x2f7/0x620 path_openat+0xd66/0xe70 do_filp_open+0xe3/0x170 do_sys_openat2+0x357/0x4a0 do_sys_open+0x87/0xd0 do_syscall_64+0x34/0x80
--- include/sound/pcm.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
include/sound/pcm.h +18 -18
@@ -104,24 +104,24 @@ struct snd_pcm_ops {#define SNDRV_PCM_POS_XRUN ((snd_pcm_uframes_t)-1)/* If you change this don't forget to change rates[] table in pcm_native.c */ -#define SNDRV_PCM_RATE_5512 (1<<0)/* 5512Hz */ -#define SNDRV_PCM_RATE_8000 (1<<1)/* 8000Hz */ -#define SNDRV_PCM_RATE_11025 (1<<2)/* 11025Hz */ -#define SNDRV_PCM_RATE_16000 (1<<3)/* 16000Hz */ -#define SNDRV_PCM_RATE_22050 (1<<4)/* 22050Hz */ -#define SNDRV_PCM_RATE_32000 (1<<5)/* 32000Hz */ -#define SNDRV_PCM_RATE_44100 (1<<6)/* 44100Hz */ -#define SNDRV_PCM_RATE_48000 (1<<7)/* 48000Hz */ -#define SNDRV_PCM_RATE_64000 (1<<8)/* 64000Hz */ -#define SNDRV_PCM_RATE_88200 (1<<9)/* 88200Hz */ -#define SNDRV_PCM_RATE_96000 (1<<10)/* 96000Hz */ -#define SNDRV_PCM_RATE_176400 (1<<11)/* 176400Hz */ -#define SNDRV_PCM_RATE_192000 (1<<12)/* 192000Hz */ -#define SNDRV_PCM_RATE_352800 (1<<13)/* 352800Hz */ -#define SNDRV_PCM_RATE_384000 (1<<14)/* 384000Hz */ - -#define SNDRV_PCM_RATE_CONTINUOUS (1<<30)/* continuous range */ -#define SNDRV_PCM_RATE_KNOT (1<<31)/* supports more non-continuos rates */ +#define SNDRV_PCM_RATE_5512 (1U<<0)/* 5512Hz */ +#define SNDRV_PCM_RATE_8000 (1U<<1)/* 8000Hz */ +#define SNDRV_PCM_RATE_11025 (1U<<2)/* 11025Hz */ +#define SNDRV_PCM_RATE_16000 (1U<<3)/* 16000Hz */ +#define SNDRV_PCM_RATE_22050 (1U<<4)/* 22050Hz */ +#define SNDRV_PCM_RATE_32000 (1U<<5)/* 32000Hz */ +#define SNDRV_PCM_RATE_44100 (1U<<6)/* 44100Hz */ +#define SNDRV_PCM_RATE_48000 (1U<<7)/* 48000Hz */ +#define SNDRV_PCM_RATE_64000 (1U<<8)/* 64000Hz */ +#define SNDRV_PCM_RATE_88200 (1U<<9)/* 88200Hz */ +#define SNDRV_PCM_RATE_96000 (1U<<10)/* 96000Hz */ +#define SNDRV_PCM_RATE_176400 (1U<<11)/* 176400Hz */ +#define SNDRV_PCM_RATE_192000 (1U<<12)/* 192000Hz */ +#define SNDRV_PCM_RATE_352800 (1U<<13)/* 352800Hz */ +#define SNDRV_PCM_RATE_384000 (1U<<14)/* 384000Hz */ + +#define SNDRV_PCM_RATE_CONTINUOUS (1U<<30)/* continuous range */ +#define SNDRV_PCM_RATE_KNOT (1U<<31)/* supports more non-continuos rates */ #define SNDRV_PCM_RATE_8000_44100 (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|\ SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_22050|\
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 143/658 ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT
In reply to Greg Kroah-HartmanFrom: Baisong Zhong <[email protected]>
[ Upstream commit cf59e1e4c79bf741905484cdb13c130b53576a16 ]
Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below:
UBSAN: shift-out-of-bounds in sound/core/seq/seq_clientmgr.c:509:22 left shift of 1 by 31 places cannot be represented in type 'int' ... Call Trace: <TASK> dump_stack_lvl+0x8d/0xcf ubsan_epilogue+0xa/0x44 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 snd_seq_deliver_single_event.constprop.21+0x191/0x2f0 snd_seq_deliver_event+0x1a2/0x350 snd_seq_kernel_client_dispatch+0x8b/0xb0 snd_seq_client_notify_subscription+0x72/0xa0 snd_seq_ioctl_subscribe_port+0x128/0x160 snd_seq_kernel_client_ctl+0xce/0xf0 snd_seq_oss_create_client+0x109/0x15b alsa_seq_oss_init+0x11c/0x1aa do_one_initcall+0x80/0x440 kernel_init_freeable+0x370/0x3c3 kernel_init+0x1b/0x190 ret_from_fork+0x1f/0x30 </TASK>
--- include/uapi/sound/asequencer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/uapi/sound/asequencer.h +4 -4
@@ -344,10 +344,10 @@ typedef int __bitwise snd_seq_client_type_t;#define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2)/* event filter flags */ -#define SNDRV_SEQ_FILTER_BROADCAST (1<<0)/* accept broadcast messages */ -#define SNDRV_SEQ_FILTER_MULTICAST (1<<1)/* accept multicast messages */ -#define SNDRV_SEQ_FILTER_BOUNCE (1<<2)/* accept bounce event in error */ -#define SNDRV_SEQ_FILTER_USE_EVENT (1<<31)/* use event filter */ +#define SNDRV_SEQ_FILTER_BROADCAST (1U<<0)/* accept broadcast messages */ +#define SNDRV_SEQ_FILTER_MULTICAST (1U<<1)/* accept multicast messages */ +#define SNDRV_SEQ_FILTER_BOUNCE (1U<<2)/* accept bounce event in error */ +#define SNDRV_SEQ_FILTER_USE_EVENT (1U<<31)/* use event filter */ struct snd_seq_client_info {int client;/* client number to inquire */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 144/658 regulator: core: use kfree_const() to free space conditionally
In reply to Greg Kroah-HartmanFrom: Wang ShaoBo <[email protected]>
[ Upstream commit dc8d006d15b623c1d80b90b45d6dcb6e890dad09 ]
Use kfree_const() to free supply_name conditionally in create_regulator() as supply_name may be allocated from kmalloc() or directly from .rodata section.
--- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +1 -1
@@ -1604,7 +1604,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, regulator =kzalloc (sizeof (*regulator),GFP_KERNEL );if (regulator ==NULL ) { -kfree (supply_name); +kfree_const (supply_name);return NULL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 145/658 clk: rockchip: Fix memory leak in rockchip_clk_register_pll()
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit 739a6a6bbdb793bd57938cb24aa5a6df89983546 ]
If clk_register() fails, @pll->rate_table may have allocated memory by kmemdup(), so it needs to be freed, otherwise will cause memory leak issue, this patch fixes it.
--- drivers/clk/rockchip/clk-pll.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/rockchip/clk-pll.c +1 -0
@@ -963,6 +963,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,return mux_clk; err_pll: +kfree (pll->rate_table);clk_unregister (mux_clk); mux_clk = pll_clk; err_mux:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 146/658 bonding: Export skip slave logic to function
In reply to Greg Kroah-HartmanFrom: Maor Gottlieb <[email protected]>
[ Upstream commit 119d48fd4298594beccf4f2ecd00627826ce2646 ]
As a preparation for following change that add array of all slaves, extract code that skip slave to function.
Stable-dep-of: f8a65ab2f3ff ("bonding: fix link recovery in mode 2 when updelay is nonzero")
--- drivers/net/bonding/bond_main.c | 47 ++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 21 deletions(-)
drivers/net/bonding/bond_main.c +26 -21
@@ -4040,6 +4040,29 @@ static void bond_slave_arr_handler(struct work_struct *work)bond_slave_arr_work_rearm (bond,1 ); } +static void bond_skip_slave (struct bond_up_slave *slaves, +struct slave *skipslave) +{ +int idx; + +/* Rare situation where caller has asked to skip a specific +* slave but allocation failed (most likely!). BTW this is +* only possible when the call is initiated from +* __bond_release_one(). In this situation; overwrite the +* skipslave entry in the array with the last entry from the +* array to avoid a situation where the xmit path may choose +* this to-be-skipped slave to send a packet out. +*/ +for (idx =0 ; slaves && idx < slaves->count; idx++) { +if (skipslave == slaves->arr[idx]) { + slaves->arr[idx] = + slaves->arr[slaves->count -1 ]; + slaves->count--; +break ; + } + } +} +/* Build the usable slaves array in control path for modes that use xmit-hash * to determine the slave interface - * (a) BOND_MODE_8023AD
@@ -4109,27 +4132,9 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)if (old_arr)kfree_rcu (old_arr, rcu); out: -if (ret !=0 && skipslave) { -int idx; - -/* Rare situation where caller has asked to skip a specific -* slave but allocation failed (most likely!). BTW this is -* only possible when the call is initiated from -* __bond_release_one(). In this situation; overwrite the -* skipslave entry in the array with the last entry from the -* array to avoid a situation where the xmit path may choose -* this to-be-skipped slave to send a packet out. -*/ - old_arr =rtnl_dereference (bond->slave_arr); -for (idx =0 ; old_arr !=NULL && idx < old_arr->count; idx++) { -if (skipslave == old_arr->arr[idx]) { - old_arr->arr[idx] = - old_arr->arr[old_arr->count-1 ]; - old_arr->count--; -break ; - } - } - } +if (ret !=0 && skipslave) +bond_skip_slave (rtnl_dereference (bond->slave_arr), skipslave); +return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 147/658 bonding: Rename slave_arr to usable_slaves
In reply to Greg Kroah-HartmanFrom: Maor Gottlieb <[email protected]>
[ Upstream commit ed7d4f023b1a9b0578f20d66557c66452ab845ec ]
Rename slave_arr to usable_slaves, since we will have two arrays, one for the usable slaves and the other to all slaves.
Stable-dep-of: f8a65ab2f3ff ("bonding: fix link recovery in mode 2 when updelay is nonzero")
--- drivers/net/bonding/bond_alb.c | 4 ++-- drivers/net/bonding/bond_main.c | 40 ++++++++++++++++----------------- include/net/bonding.h | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-)
drivers/net/bonding/bond_alb.c +2 -2
@@ -1360,7 +1360,7 @@ netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)struct bond_up_slave *slaves;unsigned int count; - slaves =rcu_dereference (bond->slave_arr); + slaves =rcu_dereference (bond->usable_slaves); count = slaves ?READ_ONCE (slaves->count) :0 ;if (likely (count)) tx_slave = slaves->arr[hash_index %
@@ -1494,7 +1494,7 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)struct bond_up_slave *slaves;unsigned int count; - slaves =rcu_dereference (bond->slave_arr); + slaves =rcu_dereference (bond->usable_slaves); count = slaves ?READ_ONCE (slaves->count) :0 ;if (likely (count)) tx_slave = slaves->arr[bond_xmit_hash(bond, skb) %
drivers/net/bonding/bond_main.c +20 -20
@@ -4073,9 +4073,9 @@ static void bond_skip_slave(struct bond_up_slave *slaves,*/ int bond_update_slave_arr (struct bonding *bond,struct slave *skipslave) { +struct bond_up_slave *usable_slaves, *old_usable_slaves;struct slave *slave;struct list_head *iter; -struct bond_up_slave *new_arr, *old_arr;int agg_id =0 ;int ret =0 ;
@@ -4083,11 +4083,10 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)WARN_ON (lockdep_is_held (&bond->mode_lock));#endif - new_arr = kzalloc(offsetof(struct bond_up_slave, arr[bond->slave_cnt]), - GFP_KERNEL); -if (!new_arr) { + usable_slaves =kzalloc (struct_size (usable_slaves, arr, + bond->slave_cnt),GFP_KERNEL ); +if (!usable_slaves) { ret = -ENOMEM ; -pr_err ("Failed to build slave-array.\n" ); goto out; }if (BOND_MODE (bond) ==BOND_MODE_8023AD ) {
@@ -4095,14 +4094,14 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)if (bond_3ad_get_active_agg_info (bond, &ad_info)) {pr_debug ("bond_3ad_get_active_agg_info failed\n" ); -kfree_rcu (new_arr, rcu); +kfree_rcu (usable_slaves, rcu);/* No active aggragator means it's not safe to use * the previous array. */ - old_arr =rtnl_dereference (bond->slave_arr); -if (old_arr) { -RCU_INIT_POINTER (bond->slave_arr,NULL ); -kfree_rcu (old_arr, rcu); + old_usable_slaves =rtnl_dereference (bond->usable_slaves); +if (old_usable_slaves) { +RCU_INIT_POINTER (bond->usable_slaves,NULL ); +kfree_rcu (old_usable_slaves, rcu); } goto out; }
@@ -4122,18 +4121,19 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)continue ;slave_dbg (bond->dev, slave->dev,"Adding slave to tx hash array[%d]\n" , - new_arr->count); + usable_slaves->count); - new_arr->arr[new_arr->count++] = slave; + usable_slaves->arr[usable_slaves->count++] = slave; } - old_arr =rtnl_dereference (bond->slave_arr); -rcu_assign_pointer (bond->slave_arr, new_arr); -if (old_arr) -kfree_rcu (old_arr, rcu); + old_usable_slaves =rtnl_dereference (bond->usable_slaves); +rcu_assign_pointer (bond->usable_slaves, usable_slaves); +if (old_usable_slaves) +kfree_rcu (old_usable_slaves, rcu); out:if (ret !=0 && skipslave) -bond_skip_slave (rtnl_dereference (bond->slave_arr), skipslave); +bond_skip_slave (rtnl_dereference (bond->usable_slaves), + skipslave);return ret; }
@@ -4150,7 +4150,7 @@ static netdev_tx_t bond_3ad_xor_xmit(struct sk_buff *skb,struct bond_up_slave *slaves;unsigned int count; - slaves =rcu_dereference (bond->slave_arr); + slaves =rcu_dereference (bond->usable_slaves); count = slaves ?READ_ONCE (slaves->count) :0 ;if (likely (count)) { slave = slaves->arr[bond_xmit_hash (bond, skb) % count];
@@ -4457,9 +4457,9 @@ static void bond_uninit(struct net_device *bond_dev)__bond_release_one (bond_dev, slave->dev, true, true);netdev_info (bond_dev,"Released all slaves\n" ); - arr =rtnl_dereference (bond->slave_arr); + arr =rtnl_dereference (bond->usable_slaves);if (arr) { -RCU_INIT_POINTER (bond->slave_arr,NULL ); +RCU_INIT_POINTER (bond->usable_slaves,NULL );kfree_rcu (arr, rcu); }
include/net/bonding.h +1 -1
@@ -205,7 +205,7 @@ struct bonding {struct slave __rcu *curr_active_slave;struct slave __rcu *current_arp_slave;struct slave __rcu *primary_slave; -struct bond_up_slave __rcu *slave_arr;/* Array of usable slaves */ +struct bond_up_slave __rcu *usable_slaves;/* Array of usable slaves */ bool force_primary;s32 slave_cnt;/* never change this value outside the attach/detach wrappers */ int (*recv_probe)(const struct sk_buff *, struct bonding *,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 148/658 bonding: fix link recovery in mode 2 when updelay is nonzero
In reply to Greg Kroah-HartmanFrom: Jonathan Toppins <[email protected]>
[ Upstream commit f8a65ab2f3ff7410921ebbf0dc55453102c33c56 ]
Before this change when a bond in mode 2 lost link, all of its slaves lost link, the bonding device would never recover even after the expiration of updelay. This change removes the updelay when the bond currently has no usable links. Conforming to bonding.txt section 13.1 paragraph 4.
--- drivers/net/bonding/bond_main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +10 -1
@@ -2107,7 +2107,16 @@ static int bond_miimon_inspect(struct bonding *bond)struct slave *slave;bool ignore_updelay; - ignore_updelay = !rcu_dereference (bond->curr_active_slave); +if (BOND_MODE (bond) ==BOND_MODE_ACTIVEBACKUP ) { + ignore_updelay = !rcu_dereference (bond->curr_active_slave); + }else { +struct bond_up_slave *usable_slaves; + + usable_slaves =rcu_dereference (bond->usable_slaves); + +if (usable_slaves && usable_slaves->count ==0 ) + ignore_updelay = true; + }bond_for_each_slave_rcu (bond, slave, iter) {bond_propose_link_state (slave,BOND_LINK_NOCHANGE );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 149/658 mtd: maps: pxa2xx-flash: fix memory leak in probe
In reply to Greg Kroah-HartmanFrom: Zheng Yongjun <[email protected]>
[ Upstream commit 2399401feee27c639addc5b7e6ba519d3ca341bf ]
Free 'info' upon remapping error to avoid a memory leak.
--- drivers/mtd/maps/pxa2xx-flash.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mtd/maps/pxa2xx-flash.c +2 -0
@@ -66,6 +66,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)if (!info->map.virt) {printk (KERN_WARNING "Failed to ioremap %s\n" , info->map.name); +kfree (info);return -ENOMEM ; } info->map.cached =ioremap_cache (info->map.phys, info->map.size);
@@ -87,6 +88,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)iounmap ((void *)info->map.virt);if (info->map.cached)iounmap (info->map.cached); +kfree (info);return -EIO ; } info->mtd->dev.parent = &pdev->dev;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 150/658 media: imon: fix a race condition in send_packet()
In reply to Greg Kroah-HartmanFrom: Gautam Menghani <[email protected]>
[ Upstream commit 813ceef062b53d68f296aa3cb944b21a091fabdb ]
The function send_packet() has a race condition as follows:
func send_packet()
{
// do work
call usb_submit_urb()
mutex_unlock()
wait_for_event_interruptible() <-- lock gone
mutex_lock()
}
func vfd_write()
{
mutex_lock()
call send_packet() <- prev call is not completed mutex_unlock()
}
When the mutex is unlocked and the function send_packet() waits for the call to complete, vfd_write() can start another call, which leads to the "URB submitted while active" warning in usb_submit_urb(). Fix this by removing the mutex_unlock() call in send_packet() and using mutex_lock_interruptible().
--- drivers/media/rc/imon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/rc/imon.c +3 -3
@@ -604,15 +604,14 @@ static int send_packet(struct imon_context *ictx)pr_err_ratelimited ("error submitting urb(%d)\n" , retval); }else {/* Wait for transmission to complete (or abort) */ -mutex_unlock (&ictx->lock); retval =wait_for_completion_interruptible ( &ictx->tx.finished);if (retval) {usb_kill_urb (ictx->tx_urb);pr_err_ratelimited ("task interrupted\n" ); } -mutex_lock (&ictx->lock); + ictx->tx.busy = false; retval = ictx->tx.status;if (retval)pr_err_ratelimited ("packet tx failed (%d)\n" , retval);
@@ -919,7 +918,8 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,return -ENODEV ; } -mutex_lock (&ictx->lock); +if (mutex_lock_interruptible (&ictx->lock)) +return -ERESTARTSYS ;if (!ictx->dev_present_intf0) {pr_err_ratelimited ("no iMON device present\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 151/658 clk: imx8mn: correct the usb1_ctrl parent to be usb_bus
In reply to Greg Kroah-HartmanFrom: Li Jun <[email protected]>
[ Upstream commit 134d43bb1ff09a696996f16ed8b28d404b770c8a ]
Per latest imx8mn datasheet of CCM, the parent of usb1_ctrl_root_clk should be usb_bus.
--- drivers/clk/imx/clk-imx8mn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mn.c +1 -1
@@ -582,7 +582,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) clks[IMX8MN_CLK_UART2_ROOT ] =imx_clk_gate4 ("uart2_root_clk" ,"uart2" , base +0x44a0 ,0 ); clks[IMX8MN_CLK_UART3_ROOT ] =imx_clk_gate4 ("uart3_root_clk" ,"uart3" , base +0x44b0 ,0 ); clks[IMX8MN_CLK_UART4_ROOT ] =imx_clk_gate4 ("uart4_root_clk" ,"uart4" , base +0x44c0 ,0 ); - clks[IMX8MN_CLK_USB1_CTRL_ROOT ] =imx_clk_gate4 ("usb1_ctrl_root_clk" ,"usb_core_ref" , base +0x44d0 ,0 ); + clks[IMX8MN_CLK_USB1_CTRL_ROOT ] =imx_clk_gate4 ("usb1_ctrl_root_clk" ,"usb_bus" , base +0x44d0 ,0 ); clks[IMX8MN_CLK_GPU_CORE_ROOT ] =imx_clk_gate4 ("gpu_core_root_clk" ,"gpu_core_div" , base +0x44f0 ,0 ); clks[IMX8MN_CLK_USDHC1_ROOT ] =imx_clk_gate4 ("usdhc1_root_clk" ,"usdhc1" , base +0x4510 ,0 ); clks[IMX8MN_CLK_USDHC2_ROOT ] =imx_clk_gate4 ("usdhc2_root_clk" ,"usdhc2" , base +0x4520 ,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 152/658 clk: imx: replace osc_hdmi with dummy
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit e7fa365ff66f16772dc06b480cd78f858d10856b ]
There is no occurrence of the hdmi oscillator in the reference manual (document IMX8MNRM Rev 2, 07/2022). Further, if we consider the indexes 76-81 and 134 of the "Clock Root" table of chapter 5 of the RM, there is no entry for the source select bits 101b, which is the setting referenced by "osc_hdmi".
Fix by renaming "osc_hdmi" with "dummy", a clock which has already been used for missing source select bits.
Tested on the BSH SystemMaster (SMM) S2 board.
--- drivers/clk/imx/clk-imx8mn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/imx/clk-imx8mn.c +6 -6
@@ -189,27 +189,27 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out "sys_pll3_out", "clk_ext4", };static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai6_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai7_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_spdif1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , }; static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 153/658 pinctrl: pinconf-generic: add missing of_node_put()
In reply to Greg Kroah-HartmanFrom: ZhangPeng <[email protected]>
[ Upstream commit 5ead93289815a075d43c415e35c8beafafb801c9 ]
of_node_put() needs to be called when jumping out of the loop, since for_each_available_child_of_node() will increase the refcount of node.
--- drivers/pinctrl/pinconf-generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/pinconf-generic.c +3 -1
@@ -391,8 +391,10 @@ int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,for_each_available_child_of_node (np_config, np) { ret =pinconf_generic_dt_subnode_to_map (pctldev, np, map, &reserved_maps, num_maps, type); -if (ret <0 ) +if (ret <0 ) { +of_node_put (np); goto exit; + } }return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 154/658 media: dvb-core: Fix ignored return value in dvb_register_frontend()
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit a574359e2e71ce16be212df3a082ed60a4bd2c5f ]
In dvb_register_frontend(), dvb_register_device() is possible to fail but its return value is ignored.
It will cause use-after-free when module is removed, because in dvb_unregister_frontend() it tries to unregister a not registered device.
BUG: KASAN: use-after-free in dvb_remove_device+0x18b/0x1f0 [dvb_core] Read of size 4 at addr ffff88800dff4824 by task rmmod/428 CPU: 3 PID: 428 Comm: rmmod Call Trace: <TASK> ... dvb_remove_device+0x18b/0x1f0 [dvb_core] dvb_unregister_frontend+0x7b/0x130 [dvb_core] vidtv_bridge_remove+0x6e/0x160 [dvb_vidtv_bridge] ...
Fix this by catching return value of dvb_register_device(). However the fe->refcount can't be put to zero immediately, because there are still modules calling dvb_frontend_detach() when dvb_register_frontend() fails.
--- drivers/media/dvb-core/dvb_frontend.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dvb_frontend.c +7 -1
@@ -2961,6 +2961,7 @@ int dvb_register_frontend(struct dvb_adapter *dvb, .name = fe->ops.info.name,#endif }; +int ret;dev_dbg (dvb->device,"%s:\n" , __func__);
@@ -2994,8 +2995,13 @@ int dvb_register_frontend(struct dvb_adapter *dvb,"DVB: registering adapter %i frontend %i (%s)...\n" , fe->dvb->num, fe->id, fe->ops.info.name); -dvb_register_device (fe->dvb, &fepriv->dvbdev, &dvbdev_template, + ret =dvb_register_device (fe->dvb, &fepriv->dvbdev, &dvbdev_template, fe,DVB_DEVICE_FRONTEND ,0 ); +if (ret) { +dvb_frontend_put (fe); +mutex_unlock (&frontend_mutex); +return ret; + }/* * Initialize the cache to the proper values according with the
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 155/658 media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()
In reply to Greg Kroah-HartmanFrom: Baisong Zhong <[email protected]>
[ Upstream commit 0ed554fd769a19ea8464bb83e9ac201002ef74ad ]
Wei Chen reports a kernel bug as blew:
general protection fault, probably for non-canonical address KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] ... Call Trace: <TASK> __i2c_transfer+0x77e/0x1930 drivers/i2c/i2c-core-base.c:2109 i2c_transfer+0x1d5/0x3d0 drivers/i2c/i2c-core-base.c:2170 i2cdev_ioctl_rdwr+0x393/0x660 drivers/i2c/i2c-dev.c:297 i2cdev_ioctl+0x75d/0x9f0 drivers/i2c/i2c-dev.c:458 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl+0xfb/0x170 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7fd834a8bded
In az6027_i2c_xfer(), if msg[i].addr is 0x99, a null-ptr-deref will caused when accessing msg[i].buf. For msg[i].len is 0 and msg[i].buf is null.
Fix this by checking msg[i].len in az6027_i2c_xfer().
--- drivers/media/usb/dvb-usb/az6027.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/usb/dvb-usb/az6027.c +4 -0
@@ -975,6 +975,10 @@ static int az6027_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nif (msg[i].addr ==0x99 ) { req =0xBE ; index =0 ; +if (msg[i].len <1 ) { + i = -EOPNOTSUPP ; +break ; + } value = msg[i].buf[0 ] &0x00ff ; length =1 ;az6027_usb_out_op (d, req, value, index, data, length);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 156/658 media: s5p-mfc: Add variant data for MFC v7 hardware for Exynos 3250 SoC
In reply to Greg Kroah-HartmanFrom: Aakarsh Jain <[email protected]>
[ Upstream commit f50ebe10f5d8092c37e2bd430c78e03bf38b1e20 ]
Commit 5441e9dafdfc6dc40 ("[media] s5p-mfc: Core support for MFC v7") which adds mfc v7 support for Exynos3250 and use the same compatible string as used by Exynos5240 but both the IPs are a bit different in terms of IP clock.
Add variant driver data based on the new compatible string "samsung,exynos3250-mfc" for Exynos3250 SoC.
--- drivers/media/platform/s5p-mfc/s5p_mfc.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/media/platform/s5p-mfc/s5p_mfc.c +15 -2
@@ -1580,8 +1580,18 @@ static struct s5p_mfc_variant mfc_drvdata_v7 = { .port_num = MFC_NUM_PORTS_V7, .buf_size = &buf_size_v7, .fw_name[0] = "s5p-mfc-v7.fw", - .clk_names = {"mfc", "sclk_mfc"}, - .num_clocks = 2, + .clk_names = {"mfc"}, + .num_clocks = 1, +}; + +static struct s5p_mfc_variant mfc_drvdata_v7_3250 = { + .version =MFC_VERSION_V7 , + .version_bit =MFC_V7_BIT , + .port_num =MFC_NUM_PORTS_V7 , + .buf_size = &buf_size_v7, + .fw_name[0 ] ="s5p-mfc-v7.fw" , + .clk_names = {"mfc" ,"sclk_mfc" }, + .num_clocks =2 , }; static struct s5p_mfc_buf_size_v6 mfc_buf_size_v8 = {
@@ -1651,6 +1661,9 @@ static const struct of_device_id exynos_mfc_match[] = { }, { .compatible = "samsung,mfc-v7", .data = &mfc_drvdata_v7, + }, { + .compatible = "samsung,exynos3250-mfc", + .data = &mfc_drvdata_v7_3250, }, { .compatible = "samsung,mfc-v8", .data = &mfc_drvdata_v8,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 157/658 drm/tegra: Add missing clk_disable_unprepare() in tegra_dc_probe()
In reply to Greg Kroah-HartmanFrom: Zhang Zekun <[email protected]>
[ Upstream commit 7ad4384d53c67672a8720cdc2ef638d7d1710ab8 ]
Add the missing clk_disable_unprepare() before return from tegra_dc_probe() in the error handling path.
--- drivers/gpu/drm/tegra/dc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +3 -1
@@ -2458,8 +2458,10 @@ static int tegra_dc_probe(struct platform_device *pdev)usleep_range (2000 ,4000 ); err =reset_control_assert (dc->rst); -if (err <0 ) +if (err <0 ) { +clk_disable_unprepare (dc->clk);return err; + }usleep_range (2000 ,4000 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 158/658 ASoC: dt-bindings: wcd9335: fix reset line polarity in example
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 34cb111f8a7b98b5fec809dd194003bca20ef1b2 ]
When resetting the block, the reset line is being driven low and then high, which means that the line in DTS should be annotated as "active low".
--- Documentation/devicetree/bindings/sound/qcom,wcd9335.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/qcom,wcd9335.txt +1 -1
@@ -109,7 +109,7 @@ audio-codec@1{ reg = <1 0>; interrupts = <&msmgpio 54 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "intr2" - reset-gpios = <&msmgpio 64 0>; + reset-gpios = <&msmgpio 64 GPIO_ACTIVE_LOW>; slim-ifc-dev = <&wc9335_ifd>; clock-names = "mclk", "native"; clocks = <&rpmcc RPM_SMD_DIV_CLK1>,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 159/658 ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit d067b3378a78c9c3048ac535e31c171b6f5b5846 ]
As the mtk_btcvsd_snd_write and mtk_btcvsd_snd_read may return error, it should be better to catch the exception.
--- sound/soc/mediatek/common/mtk-btcvsd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/mediatek/common/mtk-btcvsd.c +2 -4
@@ -1054,11 +1054,9 @@ static int mtk_pcm_btcvsd_copy(struct snd_pcm_substream *substream,struct mtk_btcvsd_snd *bt =snd_soc_component_get_drvdata (component);if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) -mtk_btcvsd_snd_write (bt, buf, count); +return mtk_btcvsd_snd_write (bt, buf, count);else -mtk_btcvsd_snd_read (bt, buf, count); - -return 0 ; +return mtk_btcvsd_snd_read (bt, buf, count); }static struct snd_pcm_ops mtk_btcvsd_ops = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 160/658 NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit eef7314caf2d73a94b68ba293cd105154d3a664e ]
We need to clear the FATTR4_WORD2_SECURITY_LABEL bitmap flag irrespective of whether or not the label is too long.
--- fs/nfs/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4xdr.c +1 -1
@@ -4169,6 +4169,7 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, p =xdr_inline_decode (xdr, len);if (unlikely (!p))return -EIO ; + bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;if (len <NFS4_MAXLABELLEN ) {if (label) {if (label->len) {
@@ -4181,7 +4182,6 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, label->lfs = lfs; status =NFS_ATTR_FATTR_V4_SECURITY_LABEL ; } - bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ; }else printk (KERN_WARNING "%s: label too long (%u)!\n" , __func__, len);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 161/658 NFSv4.2: Fix a memory stomp in decode_attr_security_label
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 43c1031f7110967c240cb6e922adcfc4b8899183 ]
We must not change the value of label->len if it is zero, since that indicates we stored a label.
--- fs/nfs/nfs4xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/nfs/nfs4xdr.c +4 -6
@@ -4171,12 +4171,10 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,return -EIO ; bitmap[2 ] &= ~FATTR4_WORD2_SECURITY_LABEL ;if (len <NFS4_MAXLABELLEN ) { -if (label) { -if (label->len) { -if (label->len < len) -return -ERANGE ; -memcpy (label->label, p, len); - } +if (label && label->len) { +if (label->len < len) +return -ERANGE ; +memcpy (label->label, p, len); label->len = len; label->pi = pi; label->lfs = lfs;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 162/658 NFSv4.2: Fix initialisation of struct nfs4_label
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit c528f70f504434eaff993a5ddd52203a2010d51f ]
The call to nfs4_label_init_security() should return a fully initialised label.
--- fs/nfs/nfs4proc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
fs/nfs/nfs4proc.c +10 -5
@@ -121,6 +121,11 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,if (nfs_server_capable (dir,NFS_CAP_SECURITY_LABEL ) ==0 )return NULL ; + label->lfs =0 ; + label->pi =0 ; + label->len =0 ; + label->label =NULL ; + err =security_dentry_init_security (dentry, sattr->ia_mode, &dentry->d_name, (void **)&label->label, &label->len);if (err ==0 )
@@ -3742,7 +3747,7 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags, struct iattr *attr, int *opened) { struct nfs4_state *state; -struct nfs4_label l = {0 ,0 ,0 ,NULL }, *label =NULL ; +struct nfs4_label l, *label; label =nfs4_label_init_security (dir, ctx->dentry, attr, &l);
@@ -4497,7 +4502,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, int flags) {struct nfs_server *server =NFS_SERVER (dir); -struct nfs4_label l, *ilabel =NULL ; +struct nfs4_label l, *ilabel;struct nfs_open_context *ctx;struct nfs4_state *state;int status =0 ;
@@ -4850,7 +4855,7 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,struct nfs4_exception exception = { .interruptible = true, }; -struct nfs4_label l, *label =NULL ; +struct nfs4_label l, *label;int err; label =nfs4_label_init_security (dir, dentry, sattr, &l);
@@ -4891,7 +4896,7 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,struct nfs4_exception exception = { .interruptible = true, }; -struct nfs4_label l, *label =NULL ; +struct nfs4_label l, *label;int err; label =nfs4_label_init_security (dir, dentry, sattr, &l);
@@ -5012,7 +5017,7 @@ static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,struct nfs4_exception exception = { .interruptible = true, }; -struct nfs4_label l, *label =NULL ; +struct nfs4_label l, *label;int err; label =nfs4_label_init_security (dir, dentry, sattr, &l);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 163/658 NFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturn
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 51069e4aef6257b0454057359faed0ab0c9af083 ]
If we're asked to recover open state while a delegation return is outstanding, then the state manager thread cannot use a cached open, so if the server returns a delegation, we can end up deadlocked behind the pending delegreturn.
To avoid this problem, let's just ask the server not to give us a delegation unless we're explicitly reclaiming one.
--- fs/nfs/nfs4proc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
fs/nfs/nfs4proc.c +12 -7
@@ -2085,18 +2085,18 @@ static struct nfs4_opendata *nfs4_open_recoverdata_alloc(struct nfs_open_context }static int nfs4_open_recover_helper (struct nfs4_opendata *opendata, -fmode_t fmode) +fmode_t fmode) {struct nfs4_state *newstate; +struct nfs_server *server =NFS_SB (opendata->dentry->d_sb); +int openflags = opendata->o_arg.open_flags;int ret;if (!nfs4_mode_match_open_stateid (opendata->state, fmode))return 0 ; - opendata->o_arg.open_flags =0 ; opendata->o_arg.fmode = fmode; - opendata->o_arg.share_access =nfs4_map_atomic_open_share ( -NFS_SB (opendata->dentry->d_sb), - fmode,0 ); + opendata->o_arg.share_access = +nfs4_map_atomic_open_share (server, fmode, openflags);memset (&opendata->o_res,0 ,sizeof (opendata->o_res));memset (&opendata->c_res,0 ,sizeof (opendata->c_res));nfs4_init_opendata_res (opendata);
@@ -2671,10 +2671,15 @@ static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *sstruct nfs4_opendata *opendata;int ret; - opendata =nfs4_open_recoverdata_alloc (ctx, state, -NFS4_OPEN_CLAIM_FH ); + opendata =nfs4_open_recoverdata_alloc (ctx, state,NFS4_OPEN_CLAIM_FH );if (IS_ERR (opendata))return PTR_ERR (opendata); +/* +* We're not recovering a delegation, so ask for no delegation. +* Otherwise the recovery thread could deadlock with an outstanding +* delegation return. +*/ + opendata->o_arg.open_flags =O_DIRECT ; ret =nfs4_open_recover (opendata, state);if (ret == -ESTALE )d_drop (ctx->dentry);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 164/658 ALSA: asihpi: fix missing pci_disable_device()
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit 9d86515c3d4c0564a0c31a2df87d735353a1971e ]
pci_disable_device() need be called while module exiting, switch to use pcim_enable(), pci_disable_device() will be called in pcim_release().
--- sound/pci/asihpi/hpioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/asihpi/hpioctl.c +1 -1
@@ -352,7 +352,7 @@ int asihpi_adapter_probe(struct pci_dev *pci_dev, pci_dev->device, pci_dev->subsystem_vendor, pci_dev->subsystem_device, pci_dev->devfn); -if (pci_enable_device (pci_dev) <0 ) { +if (pcim_enable_device (pci_dev) <0 ) {dev_err (&pci_dev->dev,"pci_enable_device failed, disabling device\n" );return -EIO ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 165/658 wifi: iwlwifi: mvm: fix double free on tx path.
In reply to Greg Kroah-HartmanFrom: Ben Greear <[email protected]>
[ Upstream commit 0473cbae2137b963bd0eaa74336131cb1d3bc6c3 ]
We see kernel crashes and lockups and KASAN errors related to ax210 firmware crashes. One of the KASAN dumps pointed at the tx path, and it appears there is indeed a way to double-free an skb.
If iwl_mvm_tx_skb_sta returns non-zero, then the 'skb' sent into the method will be freed. But, in case where we build TSO skb buffer, the skb may also be freed in error case. So, return 0 in that particular error case and do cleanup manually.
BUG: KASAN: use-after-free in __list_del_entry_valid+0x12/0x90 iwlwifi 0000:06:00.0: 0x00000000 | tsf hi Read of size 8 at addr ffff88813cfa4ba0 by task btserver/9650 CPU: 4 PID: 9650 Comm: btserver Tainted: G W 5.19.8+ #5 iwlwifi 0000:06:00.0: 0x00000000 | time gp1 Hardware name: Default string Default string/SKYBAY, BIOS 5.12 02/19/2019 Call Trace: <TASK> dump_stack_lvl+0x55/0x6d print_report.cold.12+0xf2/0x684 iwlwifi 0000:06:00.0: 0x1D0915A8 | time gp2 ? __list_del_entry_valid+0x12/0x90 kasan_report+0x8b/0x180 iwlwifi 0000:06:00.0: 0x00000001 | uCode revision type ? __list_del_entry_valid+0x12/0x90 __list_del_entry_valid+0x12/0x90 iwlwifi 0000:06:00.0: 0x00000048 | uCode version major tcp_update_skb_after_send+0x5d/0x170 __tcp_transmit_skb+0xb61/0x15c0 iwlwifi 0000:06:00.0: 0xDAA05125 | uCode version minor ? __tcp_select_window+0x490/0x490 iwlwifi 0000:06:00.0: 0x00000420 | hw version ? trace_kmalloc_node+0x29/0xd0 ? __kmalloc_node_track_caller+0x12a/0x260 ? memset+0x1f/0x40 ? __build_skb_around+0x125/0x150 ? __alloc_skb+0x1d4/0x220 ? skb_zerocopy_clone+0x55/0x230 iwlwifi 0000:06:00.0: 0x00489002 | board version ? kmalloc_reserve+0x80/0x80 ? rcu_read_lock_bh_held+0x60/0xb0 tcp_write_xmit+0x3f1/0x24d0
iwlwifi 0000:06:00.0: 0x034E001C | hcmd
? __check_object_size+0x180/0x350
iwlwifi 0000:06:00.0: 0x24020000 | isr0
tcp_sendmsg_locked+0x8a9/0x1520
iwlwifi 0000:06:00.0: 0x01400000 | isr1
? tcp_sendpage+0x50/0x50
iwlwifi 0000:06:00.0: 0x48F0000A | isr2
? lock_release+0xb9/0x400 ? tcp_sendmsg+0x14/0x40 iwlwifi 0000:06:00.0: 0x00C3080C | isr3 ? lock_downgrade+0x390/0x390 ? do_raw_spin_lock+0x114/0x1d0 iwlwifi 0000:06:00.0: 0x00200000 | isr4 ? rwlock_bug.part.2+0x50/0x50 iwlwifi 0000:06:00.0: 0x034A001C | last cmd Id ? rwlock_bug.part.2+0x50/0x50 ? lockdep_hardirqs_on_prepare+0xe/0x200 iwlwifi 0000:06:00.0: 0x0000C2F0 | wait_event ? __local_bh_enable_ip+0x87/0xe0 ? inet_send_prepare+0x220/0x220 iwlwifi 0000:06:00.0: 0x000000C4 | l2p_control tcp_sendmsg+0x22/0x40 sock_sendmsg+0x5f/0x70
iwlwifi 0000:06:00.0: 0x00010034 | l2p_duration
__sys_sendto+0x19d/0x250
iwlwifi 0000:06:00.0: 0x00000007 | l2p_mhvalid
? __ia32_sys_getpeername+0x40/0x40
iwlwifi 0000:06:00.0: 0x00000000 | l2p_addr_match
? rcu_read_lock_held_common+0x12/0x50 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_bh_held+0xb0/0xb0 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_sched_held+0x5a/0xd0 ? lock_release+0xb9/0x400 ? lock_downgrade+0x390/0x390 ? ktime_get+0x64/0x130 ? ktime_get+0x8d/0x130 ? rcu_read_lock_held_common+0x12/0x50 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_held_common+0x12/0x50 ? rcu_read_lock_sched_held+0x5a/0xd0 ? rcu_read_lock_bh_held+0xb0/0xb0 ? rcu_read_lock_bh_held+0xb0/0xb0 __x64_sys_sendto+0x6f/0x80 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x7f1d126e4531 Code: 00 00 00 00 0f 1f 44 00 00 f3 0f 1e fa 48 8d 05 35 80 0c 00 41 89 ca 8b 00 85 c0 75 1c 45 31 c9 45 31 c0 b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 67 c3 66 0f 1f 44 00 00 55 48 83 ec 20 48 89 RSP: 002b:00007ffe21a679d8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 000000000000ffdc RCX: 00007f1d126e4531 RDX: 0000000000010000 RSI: 000000000374acf0 RDI: 0000000000000014 RBP: 00007ffe21a67ac0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000010 R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000000 </TASK> Allocated by task 9650: kasan_save_stack+0x1c/0x40 __kasan_slab_alloc+0x6d/0x90 kmem_cache_alloc_node+0xf3/0x2b0 __alloc_skb+0x191/0x220 tcp_stream_alloc_skb+0x3f/0x330 tcp_sendmsg_locked+0x67c/0x1520 tcp_sendmsg+0x22/0x40 sock_sendmsg+0x5f/0x70 __sys_sendto+0x19d/0x250 __x64_sys_sendto+0x6f/0x80 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Freed by task 9650: kasan_save_stack+0x1c/0x40 kasan_set_track+0x21/0x30 kasan_set_free_info+0x20/0x30 __kasan_slab_free+0x102/0x170 kmem_cache_free+0xc8/0x3e0 iwl_mvm_mac_itxq_xmit+0x124/0x270 [iwlmvm] ieee80211_queue_skb+0x874/0xd10 [mac80211] ieee80211_xmit_fast+0xf80/0x1180 [mac80211] __ieee80211_subif_start_xmit+0x287/0x680 [mac80211] ieee80211_subif_start_xmit+0xcd/0x730 [mac80211] dev_hard_start_xmit+0xf6/0x420 __dev_queue_xmit+0x165b/0x1b50 ip_finish_output2+0x66e/0xfb0 __ip_finish_output+0x487/0x6d0 ip_output+0x11c/0x350 __ip_queue_xmit+0x36b/0x9d0 __tcp_transmit_skb+0xb35/0x15c0 tcp_write_xmit+0x3f1/0x24d0 tcp_sendmsg_locked+0x8a9/0x1520 tcp_sendmsg+0x22/0x40 sock_sendmsg+0x5f/0x70 __sys_sendto+0x19d/0x250 __x64_sys_sendto+0x6f/0x80 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x46/0xb0 The buggy address belongs to the object at ffff88813cfa4b40 which belongs to the cache skbuff_fclone_cache of size 472
The buggy address is located 96 bytes inside of
472-byte region [ffff88813cfa4b40, ffff88813cfa4d18)
The buggy address belongs to the physical page:
page:ffffea0004f3e900 refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff88813cfa6c40 pfn:0x13cfa4
head:ffffea0004f3e900 order:2 compound_mapcount:0 compound_pincount:0
flags: 0x5fff8000010200(slab|head|node=0|zone=2|lastcpupid=0x3fff)
raw: 005fff8000010200 ffffea0004656b08 ffffea0008e8cf08 ffff8881081a5240
raw: ffff88813cfa6c40 0000000000170015 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88813cfa4a80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88813cfa4b00: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
>ffff88813cfa4b80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88813cfa4c00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88813cfa4c80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +11 -1
@@ -1209,6 +1209,7 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb,struct sk_buff_head mpdus_skbs;unsigned int payload_len;int ret; +struct sk_buff *orig_skb = skb;if (WARN_ON_ONCE (!mvmsta))return -1 ;
@@ -1241,8 +1242,17 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, ret =iwl_mvm_tx_mpdu (mvm, skb, &info, sta);if (ret) { +/* Free skbs created as part of TSO logic that have not yet been dequeued */ __skb_queue_purge (&mpdus_skbs); -return ret; +/* skb here is not necessarily same as skb that entered this method, +* so free it explicitly. +*/ +if (skb == orig_skb) +ieee80211_free_txskb (mvm->hw, skb); +else +kfree_skb (skb); +/* there was error, but we consumed skb one way or another, so return 0 */ +return 0 ; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 166/658 ASoC: mediatek: mt8173: Enable IRQ when pdata is ready
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
[ Upstream commit 4cbb264d4e9136acab2c8fd39e39ab1b1402b84b ]
If the device does not come straight from reset, we might receive an IRQ before we are ready to handle it.
Fixes:
[ 2.334737] Unable to handle kernel read from unreadable memory at virtual address 00000000000001e4 [ 2.522601] Call trace: [ 2.525040] regmap_read+0x1c/0x80 [ 2.528434] mt8173_afe_irq_handler+0x40/0xf0 ... [ 2.598921] start_kernel+0x338/0x42c
--- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +10 -10
@@ -1073,16 +1073,6 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) afe->dev = &pdev->dev; - irq_id =platform_get_irq (pdev,0 ); -if (irq_id <=0 ) -return irq_id <0 ? irq_id : -ENXIO ; - ret =devm_request_irq (afe->dev, irq_id, mt8173_afe_irq_handler, -0 ,"Afe_ISR_Handle" , (void *)afe); -if (ret) { -dev_err (afe->dev,"could not request_irq\n" ); -return ret; - } - afe->base_addr =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (afe->base_addr))return PTR_ERR (afe->base_addr);
@@ -1158,6 +1148,16 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)if (ret) goto err_pm_disable; + irq_id =platform_get_irq (pdev,0 ); +if (irq_id <=0 ) +return irq_id <0 ? irq_id : -ENXIO ; + ret =devm_request_irq (afe->dev, irq_id, mt8173_afe_irq_handler, +0 ,"Afe_ISR_Handle" , (void *)afe); +if (ret) { +dev_err (afe->dev,"could not request_irq\n" ); + goto err_pm_disable; + } +dev_info (&pdev->dev,"MT8173 AFE driver initialized.\n" );return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 167/658 drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios()
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit 725a521a18734f65de05b8d353b5bd0d3ca4c37a ]
As comment of pci_get_class() says, it returns a pci_device with its refcount increased and decreased the refcount for the input parameter @from if it is not NULL.
If we break the loop in radeon_atrm_get_bios() with 'pdev' not NULL, we need to call pci_dev_put() to decrease the refcount. Add the missing pci_dev_put() to avoid refcount leak.
--- drivers/gpu/drm/radeon/radeon_bios.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/radeon/radeon_bios.c +1 -0
@@ -227,6 +227,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev)if (!found)return false; +pci_dev_put (pdev); rdev->bios =kmalloc (size,GFP_KERNEL );if (!rdev->bios) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 168/658 drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios()
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit ca54639c7752edf1304d92ff4d0c049d4efc9ba0 ]
As comment of pci_get_class() says, it returns a pci_device with its refcount increased and decreased the refcount for the input parameter @from if it is not NULL.
If we break the loop in amdgpu_atrm_get_bios() with 'pdev' not NULL, we need to call pci_dev_put() to decrease the refcount. Add the missing pci_dev_put() to avoid refcount leak.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +1 -0
@@ -313,6 +313,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev)if (!found)return false; +pci_dev_put (pdev); adev->bios =kmalloc (size,GFP_KERNEL );if (!adev->bios) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 169/658 ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe
In reply to Greg Kroah-HartmanFrom: Zhang Qilong <[email protected]>
[ Upstream commit 97b801be6f8e53676b9f2b105f54e35c745c1b22 ]
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. We fix it by going to err_pm instead of err_clk.
--- sound/soc/codecs/pcm512x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/pcm512x.c +4 -4
@@ -1598,7 +1598,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)if (val >6 ) {dev_err (dev,"Invalid pll-in\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; } pcm512x->pll_in = val; }
@@ -1607,7 +1607,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)if (val >6 ) {dev_err (dev,"Invalid pll-out\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; } pcm512x->pll_out = val; }
@@ -1616,12 +1616,12 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)dev_err (dev,"Error: both pll-in and pll-out, or none\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; }if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) {dev_err (dev,"Error: pll-in == pll-out\n" ); ret = -EINVAL ; - goto err_clk; + goto err_pm; } }#endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 170/658 netfilter: conntrack: set icmpv6 redirects as RELATED
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 7d7cfb48d81353e826493d24c7cec7360950968f ]
icmp conntrack will set icmp redirects as RELATED, but icmpv6 will not do this.
For icmpv6, only icmp errors (code <= 128) are examined for RELATED state. ICMPV6 Redirects are part of neighbour discovery mechanism, those are handled by marking a selected subset (e.g. neighbour solicitations) as UNTRACKED, but not REDIRECT -- they will thus be flagged as INVALID.
Add minimal support for REDIRECTs. No parsing of neighbour options is added for simplicity, so this will only check that we have the embeeded original header (ND_OPT_REDIRECT_HDR), and then attempt to do a flow lookup for this tuple.
Also extend the existing test case to cover redirects.
--- net/netfilter/nf_conntrack_proto_icmpv6.c | 53 +++++++++++++++++++ .../netfilter/conntrack_icmp_related.sh | 36 ++++++++++++- 2 files changed, 87 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_proto_icmpv6.c +53 -0
@@ -128,6 +128,56 @@ static void icmpv6_error_log(const struct sk_buff *skb, IPPROTO_ICMPV6, "%s", msg); } +static noinline_for_stack int +nf_conntrack_icmpv6_redirect (struct nf_conn *tmpl,struct sk_buff *skb, +unsigned int dataoff, +const struct nf_hook_state *state) +{ +u8 hl =ipv6_hdr (skb)->hop_limit; +union nf_inet_addr outer_daddr; +union { +struct nd_opt_hdr nd_opt; +struct rd_msg rd_msg; + } tmp; +const struct nd_opt_hdr *nd_opt; +const struct rd_msg *rd_msg; + + rd_msg =skb_header_pointer (skb, dataoff,sizeof (*rd_msg), &tmp.rd_msg); +if (!rd_msg) { +icmpv6_error_log (skb, state,"short redirect" ); +return -NF_ACCEPT ; + } + +if (rd_msg->icmph.icmp6_code !=0 ) +return NF_ACCEPT ; + +if (hl !=255 || !(ipv6_addr_type (&ipv6_hdr (skb)->saddr) &IPV6_ADDR_LINKLOCAL )) { +icmpv6_error_log (skb, state,"invalid saddr or hoplimit for redirect" ); +return -NF_ACCEPT ; + } + + dataoff +=sizeof (*rd_msg); + +/* warning: rd_msg no longer usable after this call */ + nd_opt =skb_header_pointer (skb, dataoff,sizeof (*nd_opt), &tmp.nd_opt); +if (!nd_opt || nd_opt->nd_opt_len ==0 ) { +icmpv6_error_log (skb, state,"redirect without options" ); +return -NF_ACCEPT ; + } + +/* We could call ndisc_parse_options(), but it would need +* skb_linearize() and a bit more work. +*/ +if (nd_opt->nd_opt_type !=ND_OPT_REDIRECT_HDR ) +return NF_ACCEPT ; + +memcpy (&outer_daddr.ip6, &ipv6_hdr (skb)->daddr, +sizeof (outer_daddr.ip6)); + dataoff +=8 ; +return nf_conntrack_inet_error (tmpl, skb, dataoff, state, +IPPROTO_ICMPV6 , &outer_daddr); +} + int nf_conntrack_icmpv6_error(struct nf_conn *tmpl, struct sk_buff *skb, unsigned int dataoff,
@@ -158,6 +208,9 @@ int nf_conntrack_icmpv6_error(struct nf_conn *tmpl,return NF_ACCEPT ; } +if (icmp6h->icmp6_type ==NDISC_REDIRECT ) +return nf_conntrack_icmpv6_redirect (tmpl, skb, dataoff, state); +/* is not error message ? */ if (icmp6h->icmp6_type >=128 )return NF_ACCEPT ;
tools/testing/selftests/netfilter/conntrack_icmp_related.sh +34 -2
@@ -35,6 +35,8 @@ cleanup() { for i in 1 2;do ip netns del nsrouter$i;done } +trap cleanup EXIT + ipv4() { echo -n 192.168.$1.2 }
@@ -146,11 +148,17 @@ ip netns exec nsclient1 nft -f - <<EOF table inet filter { counter unknown { } counter related { } + counter redir4 { } + counter redir6 { } chain input { type filter hook input priority 0; policy accept; - meta l4proto { icmp, icmpv6 } ct state established,untracked accept + icmp type "redirect" ct state "related" counter name "redir4" accept + icmpv6 type "nd-redirect" ct state "related" counter name "redir6" accept + + meta l4proto { icmp, icmpv6 } ct state established,untracked accept meta l4proto { icmp, icmpv6 } ct state "related" counter name "related" accept + counter name "unknown" drop } }
@@ -279,5 +287,29 @@ else echo "ERROR: icmp error RELATED state test has failed" fi -cleanup +# add 'bad' route, expect icmp REDIRECT to be generated +ip netns exec nsclient1 ip route add 192.168.1.42 via 192.168.1.1 +ip netns exec nsclient1 ip route add dead:1::42 via dead:1::1 + +ip netns exec "nsclient1" ping -q -c 2 192.168.1.42 > /dev/null + +expect="packets 1 bytes 112" +check_counter nsclient1 "redir4" "$expect" +if [ $? -ne 0 ];then + ret=1 +fi + +ip netns exec "nsclient1" ping -c 1 dead:1::42 > /dev/null +expect="packets 1 bytes 192" +check_counter nsclient1 "redir6" "$expect" +if [ $? -ne 0 ];then + ret=1 +fi + +if [ $ret -eq 0 ];then + echo "PASS: icmp redirects had RELATED state" +else + echo "ERROR: icmp redirect RELATED state test has failed" +fi + exit $ret
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 171/658 bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit 7a9841ca025275b5b0edfb0b618934abb6ceec15 ]
In tcp_bpf_send_verdict() redirection, the eval variable is assigned to __SK_REDIRECT after the apply_bytes data is sent, if msg has more_data, sock_put() will be called multiple times.
We should reset the eval variable to __SK_NONE every time more_data starts.
This causes:
IPv4: Attempt to release TCP socket in state 1 00000000b4c925d7
------------[ cut here ]------------ refcount_t: addition on 0; use-after-free. WARNING: CPU: 5 PID: 4482 at lib/refcount.c:25 refcount_warn_saturate+0x7d/0x110 Modules linked in: CPU: 5 PID: 4482 Comm: sockhash_bypass Kdump: loaded Not tainted 6.0.0 #1 Hardware name: Red Hat KVM, BIOS 1.11.0-2.el7 04/01/2014 Call Trace: <TASK> __tcp_transmit_skb+0xa1b/0xb90 ? __alloc_skb+0x8c/0x1a0 ? __kmalloc_node_track_caller+0x184/0x320 tcp_write_xmit+0x22a/0x1110 __tcp_push_pending_frames+0x32/0xf0 do_tcp_sendpages+0x62d/0x640 tcp_bpf_push+0xae/0x2c0 tcp_bpf_sendmsg_redir+0x260/0x410 ? preempt_count_add+0x70/0xa0 tcp_bpf_send_verdict+0x386/0x4b0 tcp_bpf_sendmsg+0x21b/0x3b0 sock_sendmsg+0x58/0x70 __sys_sendto+0xfa/0x170 ? xfd_validate_state+0x1d/0x80 ? switch_fpu_return+0x59/0xe0 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x37/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
--- net/ipv4/tcp_bpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/tcp_bpf.c +2 -1
@@ -312,7 +312,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,bool cork = false, enospc =sk_msg_full (msg);struct sock *sk_redir;u32 tosend, origsize, sent, delta =0 ; -u32 eval = __SK_NONE; +u32 eval;int ret; more_data:
@@ -343,6 +343,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, tosend = msg->sg.size;if (psock->apply_bytes && psock->apply_bytes < tosend) tosend = psock->apply_bytes; + eval = __SK_NONE;switch (psock->eval) {case __SK_PASS:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 172/658 bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirect
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit 9072931f020bfd907d6d89ee21ff1481cd78b407 ]
Use apply_bytes on ingress redirect, when apply_bytes is less than the length of msg data, some data may be skipped and lost in bpf_tcp_ingress().
If there is still data in the scatterlist that has not been consumed, we cannot move the msg iter.
--- net/ipv4/tcp_bpf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ipv4/tcp_bpf.c +4 -1
@@ -203,8 +203,11 @@ static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock, tmp->sg.end = i;if (apply) { apply_bytes -= size; -if (!apply_bytes) +if (!apply_bytes) { +if (sge->length) +sk_msg_iter_var_prev (i);break ; + } } }while (i != msg->sg.end);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 173/658 bonding: uninitialized variable in bond_miimon_inspect()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e5214f363dabca240446272dac54d404501ad5e5 ]
The "ignore_updelay" variable needs to be initialized to false.
--- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -2102,10 +2102,10 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in/* called with rcu_read_lock() */ static int bond_miimon_inspect (struct bonding *bond) { +bool ignore_updelay = false;int link_state, commit =0 ;struct list_head *iter;struct slave *slave; -bool ignore_updelay;if (BOND_MODE (bond) ==BOND_MODE_ACTIVEBACKUP ) { ignore_updelay = !rcu_dereference (bond->curr_active_slave);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 174/658 spi: spidev: mask SPI_CS_HIGH in SPI_IOC_RD_MODE
In reply to Greg Kroah-HartmanFrom: Alexander Sverdlin <[email protected]>
[ Upstream commit 7dbfa445ff7393d1c4c066c1727c9e0af1251958 ]
Commit f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs") has changed the user-space interface so that bogus SPI_CS_HIGH started to appear in the mask returned by SPI_IOC_RD_MODE even for active-low CS pins. Commit 138c9c32f090
("spi: spidev: Fix CS polarity if GPIO descriptors are used") fixed only SPI_IOC_WR_MODE part of the problem. Let's fix SPI_IOC_RD_MODE symmetrically.
Test case:
#include <sys/ioctl.h>
#include <fcntl.h>
#include <linux/spi/spidev.h>
int main(int argc, char **argv)
{
char modew = SPI_CPHA;
char moder;
int f = open("/dev/spidev0.0", O_RDWR);
if (f < 0)
return 1;
ioctl(f, SPI_IOC_WR_MODE, &modew);
ioctl(f, SPI_IOC_RD_MODE, &moder);
return moder == modew ? 0 : 2;
}--- drivers/spi/spidev.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/spi/spidev.c +16 -5
@@ -373,12 +373,23 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)switch (cmd) {/* read requests */ case SPI_IOC_RD_MODE : - retval =put_user (spi->mode &SPI_MODE_MASK , - (__u8 __user *)arg); -break ;case SPI_IOC_RD_MODE32 : - retval =put_user (spi->mode &SPI_MODE_MASK , - (__u32 __user *)arg); + tmp = spi->mode; + + { +struct spi_controller *ctlr = spi->controller; + +if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && + ctlr->cs_gpiods[spi->chip_select]) + tmp &= ~SPI_CS_HIGH ; + } + +if (cmd ==SPI_IOC_RD_MODE ) + retval =put_user (tmp &SPI_MODE_MASK , + (__u8 __user *)arg); +else + retval =put_user (tmp &SPI_MODE_MASK , + (__u32 __user *)arg);break ;case SPI_IOC_RD_LSB_FIRST : retval = put_user((spi->mode & SPI_LSB_FIRST) ? 1 : 0,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 175/658 wifi: mac80211: fix memory leak in ieee80211_if_add()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 13e5afd3d773c6fc6ca2b89027befaaaa1ea7293 ]
When register_netdevice() failed in ieee80211_if_add(), ndev->tstats isn't released. Fix it.
--- net/mac80211/iface.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/iface.c +1 -0
@@ -1888,6 +1888,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, ret =register_netdevice (ndev);if (ret) { +ieee80211_if_free (ndev);free_netdev (ndev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 176/658 wifi: cfg80211: Fix not unregister reg_pdev when load_builtin_regdb_keys() fails
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 833a9fd28c9b7ccb39a334721379e992dc1c0c89 ]
In regulatory_init_db(), when it's going to return a error, reg_pdev should be unregistered. When load_builtin_regdb_keys() fails it doesn't do it and makes cfg80211 can't be reload with report:
sysfs: cannot create duplicate filename '/devices/platform/regulatory.0'
...
<TASK> dump_stack_lvl+0x79/0x9b sysfs_warn_dup.cold+0x1c/0x29 sysfs_create_dir_ns+0x22d/0x290 kobject_add_internal+0x247/0x800 kobject_add+0x135/0x1b0 device_add+0x389/0x1be0 platform_device_add+0x28f/0x790 platform_device_register_full+0x376/0x4b0 regulatory_init+0x9a/0x4b2 [cfg80211] cfg80211_init+0x84/0x113 [cfg80211] ...
--- net/wireless/reg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/wireless/reg.c +3 -1
@@ -3970,8 +3970,10 @@ static int __init regulatory_init_db(void)return -EINVAL ; err =load_builtin_regdb_keys (); -if (err) +if (err) { +platform_device_unregister (reg_pdev);return err; + }/* We always try to get an update for the static regdomain */ err =regulatory_hint_core (cfg80211_world_regdom->alpha2);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 177/658 regulator: core: fix module refcount leak in set_supply()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit da46ee19cbd8344d6860816b4827a7ce95764867 ]
If create_regulator() fails in set_supply(), the module refcount needs be put to keep refcount balanced.
--- drivers/regulator/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
@@ -1431,6 +1431,7 @@ static int set_supply(struct regulator_dev *rdev, rdev->supply =create_regulator (supply_rdev, &rdev->dev,"SUPPLY" );if (rdev->supply ==NULL ) { +module_put (supply_rdev->owner); err = -ENOMEM ;return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 178/658 clk: qcom: clk-krait: fix wrong div2 functions
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
[ Upstream commit d676d3a3717cf726d3affedbe5ba98fc4ccad7b3 ]
Currently div2 value is applied to the wrong bits. This is caused by a bug in the code where the shift is done only for lpl, for anything else the mask is not shifted to the correct bits.
Fix this by correctly shift if lpl is not supported.
--- drivers/clk/qcom/clk-krait.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/clk-krait.c +2 -0
@@ -98,6 +98,8 @@ static int krait_div2_set_rate(struct clk_hw *hw, unsigned long rate,if (d->lpl) mask = mask << (d->shift +LPL_SHIFT ) | mask << d->shift; +else + mask <<= d->shift;spin_lock_irqsave (&krait_clock_reg_lock, flags); val =krait_get_l2_indirect_reg (d->offset);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 179/658 hsr: Avoid double remove of a node.
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 0c74d9f79ec4299365bbe803baa736ae0068179e ]
Due to the hashed-MAC optimisation one problem become visible:hsr_handle_sup_frame() walks over the list of available nodes and merges two node entries into one if based on the information in the supervision both MAC addresses belong to one node. The list-walk happens on a RCU protected list and delete operation happens under a lock.
If the supervision arrives on both slave interfaces at the same time then this delete operation can occur simultaneously on two CPUs. The result is the first-CPU deletes the from the list and the second CPUs BUGs while attempting to dereference a poisoned list-entry. This happens more likely with the optimisation because a new node for the mac_B entry is created once a packet has been received and removed (merged) once the supervision frame has been received.
Avoid removing/ cleaning up a hsr_node twice by adding a `removed' field which is set to true after the removal and checked before the removal.
--- net/hsr/hsr_framereg.c | 16 +++++++++++----- net/hsr/hsr_framereg.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-)
net/hsr/hsr_framereg.c +11 -5
@@ -269,9 +269,12 @@ void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr, node_real->addr_B_port = port_rcv->type;spin_lock_bh (&hsr->list_lock); -list_del_rcu (&node_curr->mac_list); +if (!node_curr->removed) { +list_del_rcu (&node_curr->mac_list); + node_curr->removed = true; +kfree_rcu (node_curr, rcu_head); + }spin_unlock_bh (&hsr->list_lock); -kfree_rcu (node_curr, rcu_head); done:skb_push (skb,sizeof (struct hsrv1_ethhdr_sp ));
@@ -436,9 +439,12 @@ void hsr_prune_nodes(struct timer_list *t)if (time_is_before_jiffies (timestamp +msecs_to_jiffies (HSR_NODE_FORGET_TIME ))) {hsr_nl_nodedown (hsr, node->macaddress_A); -list_del_rcu (&node->mac_list); -/* Note that we need to free this entry later: */ -kfree_rcu (node, rcu_head); +if (!node->removed) { +list_del_rcu (&node->mac_list); + node->removed = true; +/* Note that we need to free this entry later: */ +kfree_rcu (node, rcu_head); + } } }spin_unlock_bh (&hsr->list_lock);
net/hsr/hsr_framereg.h +1 -0
@@ -56,6 +56,7 @@ struct hsr_node {unsigned long time_in[HSR_PT_PORTS ];bool time_in_stale[HSR_PT_PORTS ];u16 seq_out[HSR_PT_PORTS ]; +bool removed;struct rcu_head rcu_head; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 180/658 configfs: fix possible memory leak in configfs_create_dir()
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit c65234b283a65cfbfc94619655e820a5e55199eb ]
kmemleak reported memory leaks in configfs_create_dir():
unreferenced object 0xffff888009f6af00 (size 192):
comm "modprobe", pid 3777, jiffies 4295537735 (age 233.784s) backtrace:
kmem_cache_alloc (mm/slub.c:3250 mm/slub.c:3256 mm/slub.c:3263 mm/slub.c:3273)
new_fragment (./include/linux/slab.h:600 fs/configfs/dir.c:163)
configfs_register_subsystem (fs/configfs/dir.c:1857)
basic_write (drivers/hwtracing/stm/p_basic.c:14) stm_p_basic
do_one_initcall (init/main.c:1296)
do_init_module (kernel/module/main.c:2455)
...unreferenced object 0xffff888003ba7180 (size 96):
comm "modprobe", pid 3777, jiffies 4295537735 (age 233.784s) backtrace:
kmem_cache_alloc (mm/slub.c:3250 mm/slub.c:3256 mm/slub.c:3263 mm/slub.c:3273)
configfs_new_dirent (./include/linux/slab.h:723 fs/configfs/dir.c:194)
configfs_make_dirent (fs/configfs/dir.c:248)
configfs_create_dir (fs/configfs/dir.c:296)
configfs_attach_group.isra.28 (fs/configfs/dir.c:816 fs/configfs/dir.c:852)
configfs_register_subsystem (fs/configfs/dir.c:1881)
basic_write (drivers/hwtracing/stm/p_basic.c:14) stm_p_basic
do_one_initcall (init/main.c:1296)
do_init_module (kernel/module/main.c:2455)
...This is because the refcount is not correct in configfs_make_dirent(). For normal stage, the refcount is changing as:
configfs_register_subsystem()
configfs_create_dir()
configfs_make_dirent()
configfs_new_dirent() # set s_count = 1 dentry->d_fsdata = configfs_get(sd); # s_count = 2
...configfs_unregister_subsystem()
configfs_remove_dir()
remove_dir()
configfs_remove_dirent() # s_count = 1
dput() ...
*dentry_unlink_inode()*
configfs_d_iput() # s_count = 0, release
However, if we failed in configfs_create():
configfs_register_subsystem()
configfs_create_dir()
configfs_make_dirent() # s_count = 2
...
configfs_create() # fail
->out_remove:
configfs_remove_dirent(dentry)
configfs_put(sd) # s_count = 1
return PTR_ERR(inode);
There is no inode in the error path, so the configfs_d_iput() is lost and makes sd and fragment memory leaked.
To fix this, when we failed in configfs_create(), manually call configfs_put(sd) to keep the refcount correct.
--- fs/configfs/dir.c | 2 ++ 1 file changed, 2 insertions(+)
fs/configfs/dir.c +2 -0
@@ -317,6 +317,7 @@ static int configfs_create_dir(struct config_item *item, struct dentry *dentry,return 0 ; out_remove: +configfs_put (dentry->d_fsdata);configfs_remove_dirent (dentry);return PTR_ERR (inode); }
@@ -383,6 +384,7 @@ int configfs_create_link(struct configfs_dirent *target, struct dentry *parent,return 0 ; out_remove: +configfs_put (dentry->d_fsdata);configfs_remove_dirent (dentry);return PTR_ERR (inode); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 181/658 regulator: core: fix resource leak in regulator_register()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ba62319a42c50e6254e98b3f316464fac8e77968 ]
I got some resource leak reports while doing fault injection test:
OF: ERROR: memory leak, expected refcount 1 instead of 100, of_node_get()/of_node_put() unbalanced - destroy cset entry:
attach overlay node /i2c/pmic@64/regulators/buck1
unreferenced object 0xffff88810deea000 (size 512):
comm "490-i2c-rt5190a", pid 253, jiffies 4294859840 (age 5061.046s) hex dump (first 32 bytes):
00 00 00 00 ad 4e ad de ff ff ff ff 00 00 00 00 .....N..........
ff ff ff ff ff ff ff ff a0 1e 00 a1 ff ff ff ff ................
backtrace:
[<00000000d78541e2>] kmalloc_trace+0x21/0x110
[<00000000b343d153>] device_private_init+0x32/0xd0
[<00000000be1f0c70>] device_add+0xb2d/0x1030
[<00000000e3e6344d>] regulator_register+0xaf2/0x12a0
[<00000000e2f5e754>] devm_regulator_register+0x57/0xb0
[<000000008b898197>] rt5190a_probe+0x52a/0x861 [rt5190a_regulator]unreferenced object 0xffff88810b617b80 (size 32):
comm "490-i2c-rt5190a", pid 253, jiffies 4294859904 (age 5060.983s) hex dump (first 32 bytes):
72 65 67 75 6c 61 74 6f 72 2e 32 38 36 38 2d 53 regulator.2868-S
55 50 50 4c 59 00 ff ff 29 00 00 00 2b 00 00 00 UPPLY...)...+...
backtrace:
[<000000009da9280d>] __kmalloc_node_track_caller+0x44/0x1b0
[<0000000025c6a4e5>] kstrdup+0x3a/0x70
[<00000000790efb69>] create_regulator+0xc0/0x4e0
[<0000000005ed203a>] regulator_resolve_supply+0x2d4/0x440
[<0000000045796214>] regulator_register+0x10b3/0x12a0
[<00000000e2f5e754>] devm_regulator_register+0x57/0xb0
[<000000008b898197>] rt5190a_probe+0x52a/0x861 [rt5190a_regulator]After calling regulator_resolve_supply(), the 'rdev->supply' is set by set_supply(), after this set, in the error path, the resources need be released, so call regulator_put() to avoid the leaks.
--- drivers/regulator/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
@@ -5268,6 +5268,7 @@ regulator_register(const struct regulator_desc *regulator_desc,regulator_remove_coupling (rdev);mutex_unlock (®ulator_list_mutex); wash: +regulator_put (rdev->supply);kfree (rdev->coupling_desc.coupled_rdevs);mutex_lock (®ulator_list_mutex);regulator_ena_gpio_free (rdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 182/658 bpf, sockmap: fix race in sock_map_free()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 0a182f8d607464911756b4dbef5d6cad8de22469 ]
sock_map_free() calls release_sock(sk) without owning a reference on the socket. This can cause use-after-free as syzbot found [1]
Jakub Sitnicki already took care of a similar issue in sock_hash_free() in commit 75e68e5bf2c7 ("bpf, sockhash:
Synchronize delete from bucket list on map free")
[1]refcount_t: decrement hit 0; leaking memory.
WARNING: CPU: 0 PID: 3785 at lib/refcount.c:31 refcount_warn_saturate+0x17c/0x1a0 lib/refcount.c:31 Modules linked in: CPU: 0 PID: 3785 Comm: kworker/u4:6 Not tainted 6.1.0-rc7-syzkaller-00103-gef4d3ea40565 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 Workqueue: events_unbound bpf_map_free_deferred RIP: 0010:refcount_warn_saturate+0x17c/0x1a0 lib/refcount.c:31 Code: 68 8b 31 c0 e8 75 71 15 fd 0f 0b e9 64 ff ff ff e8 d9 6e 4e fd c6 05 62 9c 3d 0a 01 48 c7 c7 80 bb 68 8b 31 c0 e8 54 71 15 fd <0f> 0b e9 43 ff ff ff 89 d9 80 e1 07 80 c1 03 38 c1 0f 8c a2 fe ff RSP: 0018:ffffc9000456fb60 EFLAGS: 00010246 RAX: eae59bab72dcd700 RBX: 0000000000000004 RCX: ffff8880207057c0 RDX: 0000000000000000 RSI: 0000000000000201 RDI: 0000000000000000 RBP: 0000000000000004 R08: ffffffff816fdabd R09: fffff520008adee5 R10: fffff520008adee5 R11: 1ffff920008adee4 R12: 0000000000000004 R13: dffffc0000000000 R14: ffff88807b1c6c00 R15: 1ffff1100f638dcf FS: 0000000000000000(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b30c30000 CR3: 000000000d08e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __refcount_dec include/linux/refcount.h:344 [inline] refcount_dec include/linux/refcount.h:359 [inline] __sock_put include/net/sock.h:779 [inline] tcp_release_cb+0x2d0/0x360 net/ipv4/tcp_output.c:1092 release_sock+0xaf/0x1c0 net/core/sock.c:3468 sock_map_free+0x219/0x2c0 net/core/sock_map.c:356 process_one_work+0x81c/0xd10 kernel/workqueue.c:2289 worker_thread+0xb14/0x1330 kernel/workqueue.c:2436 kthread+0x266/0x300 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 </TASK>
--- net/core/sock_map.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/sock_map.c +2 -0
@@ -279,11 +279,13 @@ static void sock_map_free(struct bpf_map *map) sk =xchg (psk,NULL );if (sk) { +sock_hold (sk);lock_sock (sk);rcu_read_lock ();sock_map_unref (sk, psk);rcu_read_unlock ();release_sock (sk); +sock_put (sk); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 183/658 media: saa7164: fix missing pci_disable_device()
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit 57fb35d7542384cac8f198cd1c927540ad38b61a ]
Add missing pci_disable_device() in the error path in saa7164_initdev().
--- drivers/media/pci/saa7164/saa7164-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/pci/saa7164/saa7164-core.c +3 -1
@@ -1227,7 +1227,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,if (saa7164_dev_setup (dev) <0 ) { err = -EINVAL ; - goto fail_free; + goto fail_dev; }/* print pci info */
@@ -1395,6 +1395,8 @@ static int saa7164_initdev(struct pci_dev *pci_dev, fail_irq:saa7164_dev_unregister (dev); +fail_dev: +pci_disable_device (pci_dev); fail_free:v4l2_device_unregister (&dev->v4l2_dev);kfree (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 184/658 ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit cf2ea3c86ad90d63d1c572b43e1ca9276b0357ad ]
I got a null-ptr-defer error report when I do the following tests on the qemu platform:
make defconfig and CONFIG_PARPORT=m, CONFIG_PARPORT_PC=m, CONFIG_SND_MTS64=m
Then making test scripts:
cat>test_mod1.sh<<EOF
modprobe snd-mts64
modprobe snd-mts64
EOF
Executing the script, perhaps several times, we will get a null-ptr-defer report, as follow:
syzkaller:~# ./test_mod.sh snd_mts64: probe of snd_mts64.0 failed with error -5 modprobe: ERROR: could not insert 'snd_mts64': No such device BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 0 P4D 0 Oops: 0002 [#1] PREEMPT SMP PTI CPU: 0 PID: 205 Comm: modprobe Not tainted 6.1.0-rc8-00588-g76dcd734eca2 #6 Call Trace: <IRQ> snd_mts64_interrupt+0x24/0xa0 [snd_mts64] parport_irq_handler+0x37/0x50 [parport] __handle_irq_event_percpu+0x39/0x190 handle_irq_event_percpu+0xa/0x30 handle_irq_event+0x2f/0x50 handle_edge_irq+0x99/0x1b0 __common_interrupt+0x5d/0x100 common_interrupt+0xa0/0xc0 </IRQ> <TASK> asm_common_interrupt+0x22/0x40 RIP: 0010:_raw_write_unlock_irqrestore+0x11/0x30 parport_claim+0xbd/0x230 [parport] snd_mts64_probe+0x14a/0x465 [snd_mts64] platform_probe+0x3f/0xa0 really_probe+0x129/0x2c0 __driver_probe_device+0x6d/0xc0 driver_probe_device+0x1a/0xa0 __device_attach_driver+0x7a/0xb0 bus_for_each_drv+0x62/0xb0 __device_attach+0xe4/0x180 bus_probe_device+0x82/0xa0 device_add+0x550/0x920 platform_device_add+0x106/0x220 snd_mts64_attach+0x2e/0x80 [snd_mts64] port_check+0x14/0x20 [parport] bus_for_each_dev+0x6e/0xc0 __parport_register_driver+0x7c/0xb0 [parport] snd_mts64_module_init+0x31/0x1000 [snd_mts64] do_one_initcall+0x3c/0x1f0 do_init_module+0x46/0x1c6 load_module+0x1d8d/0x1e10 __do_sys_finit_module+0xa2/0xf0 do_syscall_64+0x37/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd </TASK> Kernel panic - not syncing: Fatal exception in interrupt Rebooting in 1 seconds..
The mts wa not initialized during interrupt, we add check for mts to fix this bug.
--- sound/drivers/mts64.c | 3 +++ 1 file changed, 3 insertions(+)
sound/drivers/mts64.c +3 -0
@@ -816,6 +816,9 @@ static void snd_mts64_interrupt(void *private)u8 status, data;struct snd_rawmidi_substream *substream; +if (!mts) +return ; +spin_lock (&mts->lock); ret =mts64_read (mts->pardev->port); data = ret &0x00ff ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 185/658 xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 9181f40fb2952fd59ecb75e7158620c9c669eee3 ]
If rdma receive buffer allocate failed, should call rpcrdma_regbuf_free() to free the send buffer, otherwise, the buffer data will be leaked.
--- net/sunrpc/xprtrdma/verbs.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/xprtrdma/verbs.c +1 -0
@@ -1037,6 +1037,7 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,kfree (req->rl_sendbuf); out3:kfree (req->rl_rdmabuf); +rpcrdma_regbuf_free (req->rl_sendbuf); out2:kfree (req); out1:
Signature · 1 line
2.35.1
Re: [PATCH 5.4 185/658] xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()
Hi,
Quoted 20 lines · Greg Kroah-Hartman
From: Zhang Xiaoxu <[email protected]>
[ Upstream commit
9181f40fb2952fd59ecb75e7158620c9c669eee3]If rdma receive buffer allocate failed, should call
rpcrdma_regbuf_free()to free the send buffer, otherwise, the buffer data will be leaked.Fixes bb93a1ae2bf4 ("xprtrdma: Allocate req's regbufs at xprt create time")Signed-off-by Zhang Xiaoxu <[email protected]>Signed-off-by Trond Myklebust <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/sunrpc/xprtrdma/verbs.c | 1 + 1 file changed, 1 insertion(+)net/sunrpc/xprtrdma/verbs.c +0
-0
net/sunrpc/xprtrdma/verbs.c struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size, · line 1040
Quoted 4 lines
net/sunrpc/xprtrdma/verbs.c +1
-0@@ -1037,6 +1037,7 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,kfree (req->rl_sendbuf); out3:kfree (req->rl_rdmabuf); +rpcrdma_regbuf_free (req->rl_sendbuf);
I think this introduces a double free in rpcrdma_req_create() [5.4.y]
Copying the function from 5.4.229 post the above patch here.
Comments added with //// marker.
struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,
gfp_t flags)
{
struct rpcrdma_buffer *buffer = &r_xprt->rx_buf;
struct rpcrdma_regbuf *rb;
struct rpcrdma_req *req;
size_t maxhdrsize;
req = kzalloc(sizeof(*req), flags);
if (req == NULL)
goto out1;
/* Compute maximum header buffer size in bytes */
maxhdrsize = rpcrdma_fixed_maxsz + 3 +
r_xprt->rx_ia.ri_max_segs * rpcrdma_readchunk_maxsz;
maxhdrsize *= sizeof(__be32);
rb = rpcrdma_regbuf_alloc(__roundup_pow_of_two(maxhdrsize),
DMA_TO_DEVICE, flags);
if (!rb)
goto out2;
req->rl_rdmabuf = rb;
xdr_buf_init(&req->rl_hdrbuf, rdmab_data(rb), rdmab_length(rb));
req->rl_sendbuf = rpcrdma_regbuf_alloc(size, DMA_TO_DEVICE, flags);
if (!req->rl_sendbuf)
goto out3;
req->rl_recvbuf = rpcrdma_regbuf_alloc(size, DMA_NONE, flags);
if (!req->rl_recvbuf)
goto out4; ///// let us say we hit this.
INIT_LIST_HEAD(&req->rl_free_mrs);
INIT_LIST_HEAD(&req->rl_registered);
spin_lock(&buffer->rb_lock);
list_add(&req->rl_all, &buffer->rb_allreqs);
spin_unlock(&buffer->rb_lock);
return req;out4:
kfree(req->rl_sendbuf);
//// free of (req->rl_sendbuf)
out3:
kfree(req->rl_rdmabuf);
rpcrdma_regbuf_free(req->rl_sendbuf);//// double free of req->rl_sendbuf, we have a kfree in rpcrdma_regbuf_free.
out2:
kfree(req);
out1:
return NULL;
}Found using smatch.
I looked at the history of the function, the reason is that we don't have commit b78de1dca00376aaba7a58bb5fe21c1606524abe in 5.4.y
This problem is only in 5.4.y not seen in newer LTS.
Please correct me if I am missing something here.
Thanks,
Harshit
Quoted 3 lines
net/sunrpc/xprtrdma/verbs.c +0
-0out2:kfree (req); out1:
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 185/658] xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()
Quoted 87 lines · Harshit Mogalapalli
Hi,
Quoted 20 lines · Greg Kroah-Hartman
From: Zhang Xiaoxu <[email protected]>
[ Upstream commit
9181f40fb2952fd59ecb75e7158620c9c669eee3]If rdma receive buffer allocate failed, should call
rpcrdma_regbuf_free()to free the send buffer, otherwise, the buffer data will be leaked.Fixes bb93a1ae2bf4 ("xprtrdma: Allocate req's regbufs at xprt create time")Signed-off-by Zhang Xiaoxu <[email protected]>Signed-off-by Trond Myklebust <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/sunrpc/xprtrdma/verbs.c | 1 + 1 file changed, 1 insertion(+)net/sunrpc/xprtrdma/verbs.c +0
-0net/sunrpc/xprtrdma/verbs.c struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size, · line 1040
Quoted 4 lines
net/sunrpc/xprtrdma/verbs.c +1
-0@@ -1037,6 +1037,7 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,kfree (req->rl_sendbuf); out3:kfree (req->rl_rdmabuf); +rpcrdma_regbuf_free (req->rl_sendbuf);I think this introduces a double free in
rpcrdma_req_create()[5.4.y]Copying the function from 5.4.229 post the above patch here.
Comments added with //// marker.
struct
rpcrdma_req*rpcrdma_req_create(structrpcrdma_xprt*r_xprt,size_tsize,
gfp_tflags){ struct rpcrdma_buffer *buffer = &r_xprt->rx_buf; struct rpcrdma_regbuf *rb; struct rpcrdma_req *req; size_t maxhdrsize; req = kzalloc(sizeof(*req), flags); if (req == NULL) goto out1; /* Compute maximum header buffer size in bytes */ maxhdrsize = rpcrdma_fixed_maxsz + 3 + r_xprt->rx_ia.ri_max_segs * rpcrdma_readchunk_maxsz; maxhdrsize *= sizeof(__be32); rb = rpcrdma_regbuf_alloc(__roundup_pow_of_two(maxhdrsize), DMA_TO_DEVICE, flags); if (!rb) goto out2; req->rl_rdmabuf = rb; xdr_buf_init(&req->rl_hdrbuf, rdmab_data(rb), rdmab_length(rb)); req->rl_sendbuf = rpcrdma_regbuf_alloc(size, DMA_TO_DEVICE, flags); if (!req->rl_sendbuf) goto out3; req->rl_recvbuf = rpcrdma_regbuf_alloc(size, DMA_NONE, flags); if (!req->rl_recvbuf) goto out4; ///// let us say we hit this. INIT_LIST_HEAD(&req->rl_free_mrs); INIT_LIST_HEAD(&req->rl_registered); spin_lock(&buffer->rb_lock); list_add(&req->rl_all, &buffer->rb_allreqs); spin_unlock(&buffer->rb_lock); return req;out4:
kfree(req->rl_sendbuf); //// free of (req->rl_sendbuf) out3: kfree(req->rl_rdmabuf); rpcrdma_regbuf_free(req->rl_sendbuf);//// double free of
req->rl_sendbuf, we have a kfree inrpcrdma_regbuf_free.out2:
kfree(req); out1: return NULL; }
Quoted 9 lines
Found using smatch.
I looked at the history of the function, the reason is that we don't have commit
b78de1dca00376aaba7a58bb5fe21c1606524abein 5.4.yThis problem is only in 5.4.y not seen in newer LTS.
Please correct me if I am missing something here.
I think you are correct. I'll look into fixing it on Monday, thanks for the review!
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 185/658] xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()
Quoted 93 lines · Greg Kroah-Hartman
Quoted 92 lines · Harshit Mogalapalli
Hi,
Quoted 20 lines · Greg Kroah-Hartman
From: Zhang Xiaoxu <[email protected]>
[ Upstream commit
9181f40fb2952fd59ecb75e7158620c9c669eee3]If rdma receive buffer allocate failed, should call
rpcrdma_regbuf_free()to free the send buffer, otherwise, the buffer data will be leaked.Fixes bb93a1ae2bf4 ("xprtrdma: Allocate req's regbufs at xprt create time")Signed-off-by Zhang Xiaoxu <[email protected]>Signed-off-by Trond Myklebust <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/sunrpc/xprtrdma/verbs.c | 1 + 1 file changed, 1 insertion(+)net/sunrpc/xprtrdma/verbs.c +0
-0net/sunrpc/xprtrdma/verbs.c struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size, · line 1040
Quoted 4 lines
net/sunrpc/xprtrdma/verbs.c +1
-0@@ -1037,6 +1037,7 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,kfree (req->rl_sendbuf); out3:kfree (req->rl_rdmabuf); +rpcrdma_regbuf_free (req->rl_sendbuf);I think this introduces a double free in
rpcrdma_req_create()[5.4.y]Copying the function from 5.4.229 post the above patch here.
Comments added with //// marker.
struct
rpcrdma_req*rpcrdma_req_create(structrpcrdma_xprt*r_xprt,size_tsize,
gfp_tflags){ struct rpcrdma_buffer *buffer = &r_xprt->rx_buf; struct rpcrdma_regbuf *rb; struct rpcrdma_req *req; size_t maxhdrsize; req = kzalloc(sizeof(*req), flags); if (req == NULL) goto out1; /* Compute maximum header buffer size in bytes */ maxhdrsize = rpcrdma_fixed_maxsz + 3 + r_xprt->rx_ia.ri_max_segs * rpcrdma_readchunk_maxsz; maxhdrsize *= sizeof(__be32); rb = rpcrdma_regbuf_alloc(__roundup_pow_of_two(maxhdrsize), DMA_TO_DEVICE, flags); if (!rb) goto out2; req->rl_rdmabuf = rb; xdr_buf_init(&req->rl_hdrbuf, rdmab_data(rb), rdmab_length(rb)); req->rl_sendbuf = rpcrdma_regbuf_alloc(size, DMA_TO_DEVICE, flags); if (!req->rl_sendbuf) goto out3; req->rl_recvbuf = rpcrdma_regbuf_alloc(size, DMA_NONE, flags); if (!req->rl_recvbuf) goto out4; ///// let us say we hit this. INIT_LIST_HEAD(&req->rl_free_mrs); INIT_LIST_HEAD(&req->rl_registered); spin_lock(&buffer->rb_lock); list_add(&req->rl_all, &buffer->rb_allreqs); spin_unlock(&buffer->rb_lock); return req;out4:
kfree(req->rl_sendbuf); //// free of (req->rl_sendbuf) out3: kfree(req->rl_rdmabuf); rpcrdma_regbuf_free(req->rl_sendbuf);//// double free of
req->rl_sendbuf, we have a kfree inrpcrdma_regbuf_free.out2:
kfree(req); out1: return NULL; }Found using smatch.
I looked at the history of the function, the reason is that we don't have commit
b78de1dca00376aaba7a58bb5fe21c1606524abein 5.4.y
Quoted 7 lines
Quoted 4 lines
This problem is only in 5.4.y not seen in newer LTS.
Please correct me if I am missing something here.
I think you are correct. I'll look into fixing it on Monday, thanks for the review!
I've just reverted this commit from the tree now, a working backport would be appreciated :)
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 186/658 SUNRPC: Fix missing release socket in rpc_sockname()
In reply to Greg Kroah-HartmanFrom: Wang ShaoBo <[email protected]>
[ Upstream commit 50fa355bc0d75911fe9d5072a5ba52cdb803aff7 ]
socket dynamically created is not released when getting an unintended address family type in rpc_sockname(), direct to out_release for calling sock_release().
--- net/sunrpc/clnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/clnt.c +1 -1
@@ -1354,7 +1354,7 @@ static int rpc_sockname(struct net *net, struct sockaddr *sap, size_t salen,break ;default : err = -EAFNOSUPPORT ; - goto out; + goto out_release; }if (err <0 ) {dprintk ("RPC: can't bind UDP socket (%d)\n" , err);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 187/658 NFSv4.x: Fail client initialisation if state manager thread cant run
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit b4e4f66901658fae0614dea5bf91062a5387eda7 ]
If the state manager thread fails to start, then we should just mark the client initialisation as failed so that other processes or threads don't get stuck in nfs_wait_client_init_complete().
--- fs/nfs/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/nfs4state.c +2 -0
@@ -1224,6 +1224,8 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)if (IS_ERR (task)) {printk (KERN_ERR "%s: kthread_run: %ld\n" , __func__,PTR_ERR (task)); +if (!nfs_client_init_is_complete (clp)) +nfs_mark_client_ready (clp,PTR_ERR (task));nfs4_clear_state_manager_bit (clp);nfs_put_client (clp);module_put (THIS_MODULE );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 188/658 mmc: alcor: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e93d1468f429475a753d6baa79b853b7ee5ef8c0 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and calling mmc_free_host() in the error path.
--- drivers/mmc/host/alcor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/alcor.c +4 -1
@@ -1114,7 +1114,10 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev)alcor_hw_init (host);dev_set_drvdata (&pdev->dev, host); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto free_host; +return 0 ; free_host:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 189/658 mmc: moxart: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0ca18d09c744fb030ae9bc5836c3e357e0237dea ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/moxart-mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/moxart-mmc.c +3 -1
@@ -660,7 +660,9 @@ static int moxart_probe(struct platform_device *pdev) goto out;dev_set_drvdata (dev, mmc); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto out;dev_dbg (dev,"IRQ=%d, FIFO is %d bytes\n" , irq, host->fifo_width);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 190/658 mmc: mxcmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit cde600af7b413c9fe03e85c58c4279df90e91d13 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/mxcmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/mxcmmc.c +3 -1
@@ -1158,7 +1158,9 @@ static int mxcmci_probe(struct platform_device *pdev)timer_setup (&host->watchdog, mxcmci_watchdog,0 ); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto out_free_dma;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 191/658 mmc: pxamci: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 80e1ef3afb8bfbe768380b70ffe1b6cab87d1a3b ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, ->exit() need be called to uninit the pdata.
--- drivers/mmc/host/pxamci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mmc/host/pxamci.c +6 -1
@@ -761,7 +761,12 @@ static int pxamci_probe(struct platform_device *pdev)dev_warn (dev,"gpio_ro and get_ro() both defined\n" ); } -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +if (host->pdata && host->pdata->exit) + host->pdata->exit (dev, mmc); + goto out; + }return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 192/658 mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit fc38a5a10e9e5a75eb9189854abeb8405b214cc9 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and calling mmc_free_host() in the error path, besides, led_classdev_unregister() and pm_runtime_disable() also need be called.
--- drivers/mmc/host/rtsx_usb_sdmmc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/mmc/host/rtsx_usb_sdmmc.c +10 -1
@@ -1338,6 +1338,7 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev)#ifdef RTSX_USB_USE_LEDS_CLASS int err;#endif +int ret; ucr =usb_get_intfdata (to_usb_interface (pdev->dev.parent));if (!ucr)
@@ -1374,7 +1375,15 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev)INIT_WORK (&host->led_work, rtsx_usb_update_led);#endif -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +#ifdef RTSX_USB_USE_LEDS_CLASS +led_classdev_unregister (&host->led); +#endif +mmc_free_host (mmc); +pm_runtime_disable (&pdev->dev); +return ret; + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 193/658 mmc: toshsd: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f670744a316ea983113a65313dcd387b5a992444 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, free_irq() also needs be called.
--- drivers/mmc/host/toshsd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/toshsd.c +5 -1
@@ -651,7 +651,9 @@ static int toshsd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto unmap; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto free_irq; base =pci_resource_start (pdev,0 );dev_dbg (&pdev->dev,"MMIO %pa, IRQ %d\n" , &base, pdev->irq);
@@ -660,6 +662,8 @@ static int toshsd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return 0 ; +free_irq: +free_irq (pdev->irq, host); unmap:pci_iounmap (pdev, host->ioaddr); release:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 194/658 mmc: vub300: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0613ad2401f88bdeae5594c30afe318e93b14676 ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, the timer added before mmc_add_host() needs be del.
And this patch fixes another missing call mmc_free_host() if usb_control_msg() fails.
--- drivers/mmc/host/vub300.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/mmc/host/vub300.c +8 -3
@@ -2306,14 +2306,14 @@ static int vub300_probe(struct usb_interface *interface,0x0000 ,0x0000 , &vub300->system_port_status, sizeof(vub300->system_port_status), 1000);if (retval <0 ) { - goto error4; + goto error5; }else if (sizeof (vub300->system_port_status) == retval) { vub300->card_present = (0x0001 & vub300->system_port_status.port_flags) ?1 :0 ; vub300->read_only = (0x0010 & vub300->system_port_status.port_flags) ?1 :0 ; }else { - goto error4; + goto error5; }usb_set_intfdata (interface, vub300);INIT_DELAYED_WORK (&vub300->pollwork, vub300_pollwork_thread);
@@ -2336,8 +2336,13 @@ static int vub300_probe(struct usb_interface *interface,"USB vub300 remote SDIO host controller[%d]" "connected with no SD/SDIO card inserted\n" , interface_to_InterfaceNumber(interface)); -mmc_add_host (mmc); + retval =mmc_add_host (mmc); +if (retval) + goto error6; +return 0 ; +error6: +del_timer_sync (&vub300->inactivity_timer); error5:mmc_free_host (mmc);/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 195/658 mmc: wmt-sdmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 29276d56f6ed138db0f38cd31aedc0b725c8c76c ]
mmc_add_host() may return error, if we ignore its return value, the memory that allocated in mmc_alloc_host() will be leaked and it will lead a kernel crash because of deleting not added device in the remove path.
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, clk_disable_unprepare() also needs be called.
--- drivers/mmc/host/wmt-sdmmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/wmt-sdmmc.c +5 -1
@@ -859,11 +859,15 @@ static int wmt_mci_probe(struct platform_device *pdev)/* configure the controller to a known 'ready' state */ wmt_reset_hardware (mmc); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto fail7;dev_info (&pdev->dev,"WMT SDHC Controller initialized\n" );return 0 ; +fail7: +clk_disable_unprepare (priv->clk_sdmmc); fail6:clk_put (priv->clk_sdmmc); fail5_and_a_half:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 196/658 mmc: atmel-mci: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 9e6e8c43726673ca2abcaac87640b9215fd72f4c ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
So fix this by checking the return value and calling mmc_free_host() in the error path.
--- drivers/mmc/host/atmel-mci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/mmc/host/atmel-mci.c +6 -3
@@ -2217,6 +2217,7 @@ static int atmci_init_slot(struct atmel_mci *host, {struct mmc_host *mmc;struct atmel_mci_slot *slot; +int ret; mmc =mmc_alloc_host (sizeof (struct atmel_mci_slot ), &host->pdev->dev);if (!mmc)
@@ -2300,11 +2301,13 @@ static int atmci_init_slot(struct atmel_mci *host, host->slot[id] = slot;mmc_regulator_get_supply (mmc); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +mmc_free_host (mmc); +return ret; + }if (gpio_is_valid (slot->detect_pin)) { -int ret; -timer_setup (&slot->detect_timer, atmci_detect_change,0 ); ret = request_irq(gpio_to_irq(slot->detect_pin),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 197/658 mmc: omap_hsmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit a525cad241c339ca00bf7ebf03c5180f2a9b767c ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
Fix this by checking the return value and goto error path wihch will call mmc_free_host().
--- drivers/mmc/host/omap_hsmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/omap_hsmmc.c +3 -1
@@ -1998,7 +1998,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)if (!ret) mmc->caps |=MMC_CAP_SDIO_IRQ ; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto err_irq;if (mmc_pdata (host)->name !=NULL ) { ret =device_create_file (&mmc->class_dev, &dev_attr_slot_name);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 198/658 mmc: meson-gx: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 90935f16f2650ab7416fa2ffbe5c28cb39cf3f1e ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
Fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/meson-gx-mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/meson-gx-mmc.c +3 -1
@@ -1289,7 +1289,9 @@ static int meson_mmc_probe(struct platform_device *pdev) } mmc->ops = &meson_mmc_ops; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto err_free_irq;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 199/658 mmc: via-sdmmc: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e4e46fb61e3bb4628170810d3f2b996b709b90d9 ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
Fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/via-sdmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/via-sdmmc.c +3 -1
@@ -1154,7 +1154,9 @@ static int via_sd_probe(struct pci_dev *pcidev, pcidev->subsystem_device == 0x3891) sdhost->quirks =VIA_CRDR_QUIRK_300MS_PWRDELAY ; -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto unmap;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 200/658 mmc: wbsd: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit dc5b9b50fc9d1334407e316e6e29a5097ef833bd ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
So fix this by checking the return value and goto error path which will call mmc_free_host(), besides, other resources also need be released.
--- drivers/mmc/host/wbsd.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/mmc/host/wbsd.c +11 -1
@@ -1701,7 +1701,17 @@ static int wbsd_init(struct device *dev, int base, int irq, int dma,*/ wbsd_init_device (host); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) { +if (!pnp) +wbsd_chip_poweroff (host); + +wbsd_release_resources (host); +wbsd_free_mmc (dev); + +mmc_free_host (mmc); +return ret; + }pr_info ("%s: W83L51xD" ,mmc_hostname (mmc));if (host->chip_id !=0 )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 201/658 mmc: mmci: fix return value check of mmc_add_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b38a20f29a49ae04d23750d104b25400b792b98c ]
mmc_add_host() may return error, if we ignore its return value, it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del().
So fix this by checking the return value and goto error path which will call mmc_free_host().
--- drivers/mmc/host/mmci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/mmci.c +3 -1
@@ -2079,7 +2079,9 @@ static int mmci_probe(struct amba_device *dev,pm_runtime_set_autosuspend_delay (&dev->dev,50 );pm_runtime_use_autosuspend (&dev->dev); -mmc_add_host (mmc); + ret =mmc_add_host (mmc); +if (ret) + goto clk_disable;pm_runtime_put (&dev->dev);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 202/658 media: c8sectpfe: Add of_node_put() when breaking out of loop
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 63ff05a1ad242a5a0f897921c87b70d601bda59c ]
In configure_channels(), we should call of_node_put() when breaking out of for_each_child_of_node() which will automatically increase and decrease the refcount.
--- drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c +1 -0
@@ -939,6 +939,7 @@ static int configure_channels(struct c8sectpfei *fei)if (ret) {dev_err (fei->dev,"configure_memdma_and_inputblock failed\n" ); +of_node_put (child); goto err_unmap; } index++;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 203/658 media: coda: Add check for dcoda_iram_alloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 6b8082238fb8bb20f67e46388123e67a5bbc558d ]
As the coda_iram_alloc may return NULL pointer, it should be better to check the return value
in order to avoid NULL poineter dereference, same as the others.
--- drivers/media/platform/coda/coda-bit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/coda/coda-bit.c +2 -2
@@ -852,7 +852,7 @@ static void coda_setup_iram(struct coda_ctx *ctx)/* Only H.264BP and H.263P3 are considered */ iram_info->buf_dbk_y_use =coda_iram_alloc (iram_info, w64); iram_info->buf_dbk_c_use =coda_iram_alloc (iram_info, w64); -if (!iram_info->buf_dbk_c_use) +if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use) goto out; iram_info->axi_sram_use |= dbk_bits;
@@ -876,7 +876,7 @@ static void coda_setup_iram(struct coda_ctx *ctx) iram_info->buf_dbk_y_use =coda_iram_alloc (iram_info, w128); iram_info->buf_dbk_c_use =coda_iram_alloc (iram_info, w128); -if (!iram_info->buf_dbk_c_use) +if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use) goto out; iram_info->axi_sram_use |= dbk_bits;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 204/658 media: coda: Add check for kmalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 6e5e5defdb8b0186312c2f855ace175aee6daf9b ]
As the kmalloc may return NULL pointer,
it should be better to check the return value
in order to avoid NULL poineter dereference,
same as the others.
--- drivers/media/platform/coda/coda-bit.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/platform/coda/coda-bit.c +8 -2
@@ -1082,10 +1082,16 @@ static int coda_start_encoding(struct coda_ctx *ctx) }if (dst_fourcc ==V4L2_PIX_FMT_JPEG ) { -if (!ctx->params.jpeg_qmat_tab[0 ]) +if (!ctx->params.jpeg_qmat_tab[0 ]) { ctx->params.jpeg_qmat_tab[0 ] =kmalloc (64 ,GFP_KERNEL ); -if (!ctx->params.jpeg_qmat_tab[1 ]) +if (!ctx->params.jpeg_qmat_tab[0 ]) +return -ENOMEM ; + } +if (!ctx->params.jpeg_qmat_tab[1 ]) { ctx->params.jpeg_qmat_tab[1 ] =kmalloc (64 ,GFP_KERNEL ); +if (!ctx->params.jpeg_qmat_tab[1 ]) +return -ENOMEM ; + }coda_set_jpeg_compression_quality (ctx, ctx->params.jpeg_quality); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 205/658 clk: samsung: Fix memory leak in _samsung_clk_register_pll()
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit 5174e5b0d1b669a489524192b6adcbb3c54ebc72 ]
If clk_register() fails, @pll->rate_table may have allocated memory by kmemdup(), so it needs to be freed, otherwise will cause memory leak issue, this patch fixes it.
--- drivers/clk/samsung/clk-pll.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/samsung/clk-pll.c +1 -0
@@ -1390,6 +1390,7 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx,if (ret) {pr_err ("%s: failed to register pll clock %s : %d\n" , __func__, pll_clk->name, ret); +kfree (pll->rate_table);kfree (pll);return ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 206/658 spi: spi-gpio: Dont set MOSI as an input if not 3WIRE mode
In reply to Greg Kroah-HartmanFrom: Kris Bahnsen <[email protected]>
[ Upstream commit 3a6f994f848a69deb2bf3cd9d130dd0c09730e55 ]
The addition of 3WIRE support would affect MOSI direction even when still in standard (4 wire) mode. This can lead to MOSI being at an invalid logic level when a device driver sets an SPI message with a NULL tx_buf.
spi.h states that if tx_buf is NULL then "zeros will be shifted out ... " If MOSI is tristated then the data shifted out is subject to pull resistors, keepers, or in the absence of those, noise.
This issue came to light when using spi-gpio connected to an ADS7843 touchscreen controller. MOSI pulled high when clocking MISO data in caused the SPI device to interpret this as a command which would put the device in an unexpected and non-functional state.
--- drivers/spi/spi-gpio.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/spi/spi-gpio.c +13 -3
@@ -244,9 +244,19 @@ static int spi_gpio_set_direction(struct spi_device *spi, bool output)if (output)return gpiod_direction_output (spi_gpio->mosi,1 ); - ret =gpiod_direction_input (spi_gpio->mosi); -if (ret) -return ret; +/* +* Only change MOSI to an input if using 3WIRE mode. +* Otherwise, MOSI could be left floating if there is +* no pull resistor connected to the I/O pin, or could +* be left logic high if there is a pull-up. Transmitting +* logic high when only clocking MISO data in can put some +* SPI devices in to a bad state. +*/ +if (spi->mode &SPI_3WIRE ) { + ret =gpiod_direction_input (spi_gpio->mosi); +if (ret) +return ret; + }/* * Send a turnaround high impedance cycle when switching * from output to input. Theoretically there should be
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 207/658 wifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h
In reply to Greg Kroah-HartmanFrom: Bitterblue Smith <[email protected]>
[ Upstream commit dd469a754afdb782ba3033cee102147493dc39f4 ]
This struct is used to access a sequence of bytes received from the wifi chip. It must not have any padding bytes between the members.
This doesn't change anything on my system, possibly because currently none of the members need more than byte alignment.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +1 -1
@@ -1178,7 +1178,7 @@ struct rtl8723bu_c2h {u8 dummy3_0; }__packed ra_report; }; -}; +} __packed;struct rtl8xxxu_fileops ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 208/658 wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware()
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit c2f2924bc7f9ea75ef8d95863e710168f8196256 ]
Fix to return a negative error code instead of 0 when brcmf_chip_set_active() fails. In addition, change the return value for brcmf_pcie_exit_download_state() to keep consistent.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +1 -1
@@ -616,7 +616,7 @@ static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo, }if (!brcmf_chip_set_active (devinfo->ci, resetintr)) -return -EINVAL ; +return -EIO ;return 0 ; }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -0
@@ -3367,6 +3367,7 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,/* Take arm out of reset */ if (!brcmf_chip_set_active (bus->ci, rstvec)) {brcmf_err ("error getting out of ARM core reset\n" ); + bcmerror = -EIO ; goto err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 209/658 blktrace: Fix output non-blktrace event when blk_classic option enabled
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
[ Upstream commit f596da3efaf4130ff61cd029558845808df9bf99 ]
When the blk_classic option is enabled, non-blktrace events must be filtered out. Otherwise, events of other types are output in the blktrace classic format, which is unexpected.
The problem can be triggered in the following ways:
# echo 1 > /sys/kernel/debug/tracing/options/blk_classic # echo 1 > /sys/kernel/debug/tracing/events/enable # echo blk > /sys/kernel/debug/tracing/current_tracer # cat /sys/kernel/debug/tracing/trace_pipe
--- kernel/trace/blktrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/blktrace.c +2 -1
@@ -1589,7 +1589,8 @@ blk_trace_event_print_binary(struct trace_iterator *iter, int flags,static enum print_line_t blk_tracer_print_line (struct trace_iterator *iter) { -if (!(blk_tracer_flags.val &TRACE_BLK_OPT_CLASSIC )) +if ((iter->ent->type !=TRACE_BLK ) || + !(blk_tracer_flags.val &TRACE_BLK_OPT_CLASSIC ))return TRACE_TYPE_UNHANDLED ;return print_one_line (iter, true);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 210/658 clk: socfpga: clk-pll: Remove unused variable rc
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 75fddccbca32349570b2d53955982b4117fa5515 ]
Fixes the following W=1 kernel build warning(s):
drivers/clk/socfpga/clk-pll.c: In function ‘__socfpga_pll_init’:
drivers/clk/socfpga/clk-pll.c:83:6: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable]
Stable-dep-of: 0b8ba891ad4d ("clk: socfpga: Fix memory leak in socfpga_gate_init()")
--- drivers/clk/socfpga/clk-pll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/socfpga/clk-pll.c +1 -2
@@ -80,7 +80,6 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,const char *parent_name[SOCFPGA_MAX_PARENTS ];struct clk_init_data init;struct device_node *clkmgr_np; -int rc;of_property_read_u32 (node,"reg" , ®);
@@ -113,7 +112,7 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,kfree (pll_clk);return NULL ; } - rc =of_clk_add_provider (node, of_clk_src_simple_get, clk); +of_clk_add_provider (node, of_clk_src_simple_get, clk);return clk; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 211/658 clk: socfpga: use clk_hw_register for a5/c5
In reply to Greg Kroah-HartmanFrom: Dinh Nguyen <[email protected]>
[ Upstream commit 2c2b9c6067170de2a63e7e3d9f5bb205b870de7c ]
As recommended by Stephen Boyd, convert the cyclone5/arria5 clock driver to use the clk_hw registration method.
Stable-dep-of: 0b8ba891ad4d ("clk: socfpga: Fix memory leak in socfpga_gate_init()")
--- drivers/clk/socfpga/clk-gate.c | 11 +++++++---- drivers/clk/socfpga/clk-periph.c | 8 ++++---- drivers/clk/socfpga/clk-pll.c | 18 +++++++++++------- 3 files changed, 22 insertions(+), 15 deletions(-)
drivers/clk/socfpga/clk-gate.c +7 -4
@@ -174,13 +174,14 @@ void __init socfpga_gate_init(struct device_node *node)u32 div_reg[3 ];u32 clk_phase[2 ];u32 fixed_div; -struct clk *clk; +struct clk_hw *hw_clk;struct socfpga_gate_clk *socfpga_clk;const char *clk_name = node->name;const char *parent_name[SOCFPGA_MAX_PARENTS ];struct clk_init_data init;struct clk_ops *ops;int rc; +int err; socfpga_clk =kzalloc (sizeof (*socfpga_clk),GFP_KERNEL );if (WARN_ON (!socfpga_clk))
@@ -238,12 +239,14 @@ void __init socfpga_gate_init(struct device_node *node) init.parent_names = parent_name; socfpga_clk->hw.hw.init = &init; - clk =clk_register (NULL , &socfpga_clk->hw.hw); -if (WARN_ON (IS_ERR (clk))) { + hw_clk = &socfpga_clk->hw.hw; + + err =clk_hw_register (NULL , hw_clk); +if (err) {kfree (socfpga_clk);return ; } - rc =of_clk_add_provider (node, of_clk_src_simple_get, clk); + rc =of_clk_add_provider (node, of_clk_src_simple_get, hw_clk);if (WARN_ON (rc))return ; }
drivers/clk/socfpga/clk-periph.c +4 -4
@@ -51,7 +51,7 @@ static __init void __socfpga_periph_init(struct device_node *node, const struct clk_ops *ops) {u32 reg; -struct clk *clk; +struct clk_hw *hw_clk;struct socfpga_periph_clk *periph_clk;const char *clk_name = node->name;const char *parent_name[SOCFPGA_MAX_PARENTS ];
@@ -94,13 +94,13 @@ static __init void __socfpga_periph_init(struct device_node *node, init.parent_names = parent_name; periph_clk->hw.hw.init = &init; + hw_clk = &periph_clk->hw.hw; - clk =clk_register (NULL , &periph_clk->hw.hw); -if (WARN_ON (IS_ERR (clk))) { +if (clk_hw_register (NULL , hw_clk)) {kfree (periph_clk);return ; } - rc =of_clk_add_provider (node, of_clk_src_simple_get, clk); + rc =of_clk_add_provider (node, of_clk_src_simple_get, hw_clk); }void __init socfpga_periph_init (struct device_node *node)
drivers/clk/socfpga/clk-pll.c +11 -7
@@ -70,16 +70,18 @@ static struct clk_ops clk_pll_ops = { .get_parent = clk_pll_get_parent, }; -static __init struct clk *__socfpga_pll_init (struct device_node *node, +static __init struct clk_hw *__socfpga_pll_init (struct device_node *node,const struct clk_ops *ops) {u32 reg; -struct clk *clk; +struct clk_hw *hw_clk;struct socfpga_pll *pll_clk;const char *clk_name = node->name;const char *parent_name[SOCFPGA_MAX_PARENTS ];struct clk_init_data init;struct device_node *clkmgr_np; +int rc; +int err;of_property_read_u32 (node,"reg" , ®);
@@ -107,13 +109,15 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node, clk_pll_ops.enable = clk_gate_ops.enable; clk_pll_ops.disable = clk_gate_ops.disable; - clk =clk_register (NULL , &pll_clk->hw.hw); -if (WARN_ON (IS_ERR (clk))) { + hw_clk = &pll_clk->hw.hw; + + err =clk_hw_register (NULL , hw_clk); +if (err) {kfree (pll_clk); -return NULL ; +return ERR_PTR (err); } -of_clk_add_provider (node, of_clk_src_simple_get, clk); -return clk; + rc =of_clk_add_provider (node, of_clk_src_simple_get, hw_clk); +return hw_clk; }void __init socfpga_pll_init (struct device_node *node)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 212/658 clk: socfpga: Fix memory leak in socfpga_gate_init()
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit 0b8ba891ad4d1ef6bfa4c72efc83f9f9f855f68b ]
Free @socfpga_clk and @ops on the error path to avoid memory leak issue.
--- drivers/clk/socfpga/clk-gate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/socfpga/clk-gate.c +4 -1
@@ -188,8 +188,10 @@ void __init socfpga_gate_init(struct device_node *node)return ; ops =kmemdup (&gateclk_ops,sizeof (gateclk_ops),GFP_KERNEL ); -if (WARN_ON (!ops)) +if (WARN_ON (!ops)) { +kfree (socfpga_clk);return ; + } rc =of_property_read_u32_array (node,"clk-gate" , clk_gate,2 );if (rc)
@@ -243,6 +245,7 @@ void __init socfpga_gate_init(struct device_node *node) err =clk_hw_register (NULL , hw_clk);if (err) { +kfree (ops);kfree (socfpga_clk);return ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 213/658 net: vmw_vsock: vmci: Check memcpy_from_msg()
In reply to Greg Kroah-HartmanFrom: Artem Chernyshev <[email protected]>
[ Upstream commit 44aa5a6dba8283bfda28b1517af4de711c5652a4 ]
vmci_transport_dgram_enqueue() does not check the return value of memcpy_from_msg(). If memcpy_from_msg() fails, it is possible that uninitialized memory contents are sent unintentionally instead of user's message in the datagram to the destination. Return with an error if memcpy_from_msg() fails.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- net/vmw_vsock/vmci_transport.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/vmw_vsock/vmci_transport.c +5 -1
@@ -1725,7 +1725,11 @@ static int vmci_transport_dgram_enqueue(if (!dg)return -ENOMEM ; -memcpy_from_msg (VMCI_DG_PAYLOAD (dg), msg, len); + err =memcpy_from_msg (VMCI_DG_PAYLOAD (dg), msg, len); +if (err) { +kfree (dg); +return err; + } dg->dst =vmci_make_handle (remote_addr->svm_cid, remote_addr->svm_port);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 214/658 net: defxx: Fix missing err handling in dfx_init()
In reply to Greg Kroah-HartmanFrom: Yongqiang Liu <[email protected]>
[ Upstream commit ae18dcdff0f8d7e84cd3fd9f496518b5e72d185d ]
When eisa_driver_register() or tc_register_driver() failed, the modprobe defxx would fail with some err log as follows:
Error: Driver 'defxx' is already registered, aborting...
Fix this issue by adding err hanling in dfx_init().
--- drivers/net/fddi/defxx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/net/fddi/defxx.c +18 -4
@@ -3844,10 +3844,24 @@ static int dfx_init(void)int status; status =pci_register_driver (&dfx_pci_driver); -if (!status) - status =eisa_driver_register (&dfx_eisa_driver); -if (!status) - status =tc_register_driver (&dfx_tc_driver); +if (status) + goto err_pci_register; + + status =eisa_driver_register (&dfx_eisa_driver); +if (status) + goto err_eisa_register; + + status =tc_register_driver (&dfx_tc_driver); +if (status) + goto err_tc_register; + +return 0 ; + +err_tc_register: +eisa_driver_unregister (&dfx_eisa_driver); +err_eisa_register: +pci_unregister_driver (&dfx_pci_driver); +err_pci_register:return status; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 215/658 net: stmmac: selftests: fix potential memleak in stmmac_test_arpoffload()
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
[ Upstream commit f150b63f3fa5fdd81e0dd6151e8850268e29438c ]
The skb allocated by stmmac_test_get_arp_skb() hasn't been released in some error handling case, which will lead to a memory leak. Fix this up by adding kfree_skb() to release skb.
Compile tested only.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +6 -2
@@ -1614,12 +1614,16 @@ static int stmmac_test_arpoffload(struct stmmac_priv *priv) } ret =stmmac_set_arp_offload (priv, priv->hw, true, ip_addr); -if (ret) +if (ret) { +kfree_skb (skb); goto cleanup; + } ret =dev_set_promiscuity (priv->dev,1 ); -if (ret) +if (ret) { +kfree_skb (skb); goto cleanup; + }skb_set_queue_mapping (skb,0 ); ret =dev_queue_xmit (skb);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 216/658 drivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 01de1123322e4fe1bbd0fcdf0982511b55519c03 ]
If vp alloc failed in qlcnic_sriov_init(), all previously allocated vp needs to be freed.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c +2 -0
@@ -222,6 +222,8 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)return 0 ; qlcnic_destroy_async_wq: +while (i--) +kfree (sriov->vf_info[i].vp);destroy_workqueue (bc->bc_async_wq); qlcnic_destroy_trans_wq:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 217/658 of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop()
In reply to Greg Kroah-HartmanFrom: ruanjinjie <[email protected]>
[ Upstream commit ee9d7a0e754568180a2f8ebc4aad226278a9116f ]
When kmalloc() fail to allocate memory in kasprintf(), fn_1 or fn_2 will be NULL, and strcmp() will cause null pointer dereference.
--- drivers/of/overlay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/of/overlay.c +2 -2
@@ -547,7 +547,7 @@ static int find_dup_cset_node_entry(struct overlay_changeset *ovcs, fn_1 =kasprintf (GFP_KERNEL ,"%pOF" , ce_1->np); fn_2 =kasprintf (GFP_KERNEL ,"%pOF" , ce_2->np); - node_path_match = !strcmp (fn_1, fn_2); + node_path_match = !fn_1 || !fn_2 || !strcmp (fn_1, fn_2);kfree (fn_1);kfree (fn_2);if (node_path_match) {
@@ -582,7 +582,7 @@ static int find_dup_cset_prop(struct overlay_changeset *ovcs, fn_1 =kasprintf (GFP_KERNEL ,"%pOF" , ce_1->np); fn_2 =kasprintf (GFP_KERNEL ,"%pOF" , ce_2->np); - node_path_match = !strcmp (fn_1, fn_2); + node_path_match = !fn_1 || !fn_2 || !strcmp (fn_1, fn_2);kfree (fn_1);kfree (fn_2); if (node_path_match &&
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 218/658 ethernet: s2io: dont call dev_kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 6cee96e09df54ae17784c0f38a49e0ed8229b825 ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal.
In this case, dev_kfree_skb() is called in free_tx_buffers() to drop the SKBs in tx buffers, when the card is down, so replace it with dev_kfree_skb_irq() here.
--- drivers/net/ethernet/neterion/s2io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/neterion/s2io.c +1 -1
@@ -2375,7 +2375,7 @@ static void free_tx_buffers(struct s2io_nic *nic) skb =s2io_txdl_getskb (&mac_control->fifos[i], txdp, j);if (skb) { swstats->mem_freed += skb->truesize; -dev_kfree_skb (skb); +dev_kfree_skb_irq (skb); cnt++; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 219/658 net: farsync: Fix kmemleak when rmmods farsync
In reply to Greg Kroah-HartmanFrom: Li Zetao <[email protected]>
[ Upstream commit 2f623aaf9f31de968dea6169849706a2f9be444c ]
There are two memory leaks reported by kmemleak:
unreferenced object 0xffff888114b20200 (size 128):
comm "modprobe", pid 4846, jiffies 4295146524 (age 401.345s)
hex dump (first 32 bytes):
e0 62 57 09 81 88 ff ff e0 62 57 09 81 88 ff ff .bW......bW.....
01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff815bcd82>] kmalloc_trace+0x22/0x60
[<ffffffff83d35c78>] __hw_addr_add_ex+0x198/0x6c0
[<ffffffff83d3989d>] dev_addr_init+0x13d/0x230
[<ffffffff83d1063d>] alloc_netdev_mqs+0x10d/0xe50
[<ffffffff82b4a06e>] alloc_hdlcdev+0x2e/0x80
[<ffffffffa016a741>] fst_add_one+0x601/0x10e0 [farsync]
... unreferenced object 0xffff88810b85b000 (size 1024):
comm "modprobe", pid 4846, jiffies 4295146523 (age 401.346s)
hex dump (first 32 bytes):
00 00 b0 02 00 c9 ff ff 00 70 0a 00 00 c9 ff ff .........p......
00 00 00 f2 00 00 00 f3 0a 00 00 00 02 00 00 00 ................
backtrace:
[<ffffffff815bcd82>] kmalloc_trace+0x22/0x60
[<ffffffffa016a294>] fst_add_one+0x154/0x10e0 [farsync]
[<ffffffff82060e83>] local_pci_probe+0xd3/0x170
...The root cause is traced to the netdev and fst_card_info are not freed when removes one fst in fst_remove_one(), which may trigger oom if repeated insmod and rmmod module.
Fix it by adding free_netdev() and kfree() in fst_remove_one(), just as the operations on the error handling path in fst_add_one().
--- drivers/net/wan/farsync.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wan/farsync.c +2 -0
@@ -2613,6 +2613,7 @@ fst_remove_one(struct pci_dev *pdev)for (i =0 ; i < card->nports; i++) {struct net_device *dev =port_to_dev (&card->ports[i]);unregister_hdlc_device (dev); +free_netdev (dev); }fst_disable_intr (card);
@@ -2633,6 +2634,7 @@ fst_remove_one(struct pci_dev *pdev) card->tx_dma_handle_card); } fst_card_array[card->card_no] =NULL ; +kfree (card); }static struct pci_driver fst_driver = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 220/658 net/tunnel: wait until all sk_user_data reader finish before releasing the sock
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 3cf7203ca620682165706f70a1b12b5194607dce ]
There is a race condition in vxlan that when deleting a vxlan device during receiving packets, there is a possibility that the sock is released after getting vxlan_sock vs from sk_user_data. Then in later vxlan_ecn_decapsulate(), vxlan_get_sk_family() we will got NULL pointer dereference. e.g.
#0 [ffffa25ec6978a38] machine_kexec at ffffffff8c669757 #1 [ffffa25ec6978a90] __crash_kexec at ffffffff8c7c0a4d #2 [ffffa25ec6978b58] crash_kexec at ffffffff8c7c1c48 #3 [ffffa25ec6978b60] oops_end at ffffffff8c627f2b #4 [ffffa25ec6978b80] page_fault_oops at ffffffff8c678fcb #5 [ffffa25ec6978bd8] exc_page_fault at ffffffff8d109542 #6 [ffffa25ec6978c00] asm_exc_page_fault at ffffffff8d200b62
[exception RIP: vxlan_ecn_decapsulate+0x3b]
RIP: ffffffffc1014e7b RSP: ffffa25ec6978cb0 RFLAGS: 00010246
RAX: 0000000000000008 RBX: ffff8aa000888000 RCX: 0000000000000000
RDX: 000000000000000e RSI: ffff8a9fc7ab803e RDI: ffff8a9fd1168700
RBP: ffff8a9fc7ab803e R8: 0000000000700000 R9: 00000000000010ae
R10: ffff8a9fcb748980 R11: 0000000000000000 R12: ffff8a9fd1168700
R13: ffff8aa000888000 R14: 00000000002a0000 R15: 00000000000010ae
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #7 [ffffa25ec6978ce8] vxlan_rcv at ffffffffc10189cd [vxlan] #8 [ffffa25ec6978d90] udp_queue_rcv_one_skb at ffffffff8cfb6507 #9 [ffffa25ec6978dc0] udp_unicast_rcv_skb at ffffffff8cfb6e45
#10 [ffffa25ec6978dc8] __udp4_lib_rcv at ffffffff8cfb8807 #11 [ffffa25ec6978e20] ip_protocol_deliver_rcu at ffffffff8cf76951 #12 [ffffa25ec6978e48] ip_local_deliver at ffffffff8cf76bde #13 [ffffa25ec6978ea0] __netif_receive_skb_one_core at ffffffff8cecde9b #14 [ffffa25ec6978ec8] process_backlog at ffffffff8cece139 #15 [ffffa25ec6978f00] __napi_poll at ffffffff8ceced1a
#16 [ffffa25ec6978f28] net_rx_action at ffffffff8cecf1f3 #17 [ffffa25ec6978fa0] __softirqentry_text_start at ffffffff8d4000ca #18 [ffffa25ec6978ff0] do_softirq at ffffffff8c6fbdc3
Reproducer: https://github.com/Mellanox/ovs-tests/blob/master/test-ovs-vxlan-remove-tunnel-during-traffic.sh
Fix this by waiting for all sk_user_data reader to finish before releasing the sock.
--- net/ipv4/udp_tunnel.c | 1 + 1 file changed, 1 insertion(+)
net/ipv4/udp_tunnel.c +1 -0
@@ -196,6 +196,7 @@ EXPORT_SYMBOL_GPL(udp_tunnel_xmit_skb);void udp_tunnel_sock_release (struct socket *sock) {rcu_assign_sk_user_data (sock->sk,NULL ); +synchronize_rcu ();kernel_sock_shutdown (sock,SHUT_RDWR );sock_release (sock); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 221/658 net: apple: mace: dont call dev_kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 3dfe3486c1cd4f82b466b7d307f23777137b8acc ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal.
In this case, dev_kfree_skb() is called in mace_tx_timeout() to drop the SKB, when tx timeout, so replace it with dev_kfree_skb_irq().
--- drivers/net/ethernet/apple/mace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/apple/mace.c +1 -1
@@ -841,7 +841,7 @@ static void mace_tx_timeout(struct timer_list *t)if (mp->tx_bad_runt) { mp->tx_bad_runt =0 ; }else if (i != mp->tx_fill) { -dev_kfree_skb (mp->tx_bufs[i]); +dev_kfree_skb_irq (mp->tx_bufs[i]);if (++i >=N_TX_RING ) i =0 ; mp->tx_empty = i;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 222/658 net: apple: bmac: dont call dev_kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 5fe02e046e6422c4adfdbc50206ec7186077da24 ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal.
In this case, dev_kfree_skb() is called in bmac_tx_timeout() to drop the SKB, when tx timeout, so replace it with dev_kfree_skb_irq().
--- drivers/net/ethernet/apple/bmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/apple/bmac.c +1 -1
@@ -1511,7 +1511,7 @@ static void bmac_tx_timeout(struct timer_list *t) i = bp->tx_empty; ++dev->stats.tx_errors;if (i != bp->tx_fill) { -dev_kfree_skb (bp->tx_bufs[i]); +dev_kfree_skb_irq (bp->tx_bufs[i]); bp->tx_bufs[i] =NULL ;if (++i >=N_TX_RING ) i =0 ; bp->tx_empty = i;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 223/658 net: emaclite: dont call dev_kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit d1678bf45f21fa5ae4a456f821858679556ea5f8 ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal.
In this case, dev_kfree_skb() is called in xemaclite_tx_timeout() to drop the SKB, when tx timeout, so replace it with dev_kfree_skb_irq().
--- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
@@ -541,7 +541,7 @@ static void xemaclite_tx_timeout(struct net_device *dev)xemaclite_enable_interrupts (lp);if (lp->deferred_skb) { -dev_kfree_skb (lp->deferred_skb); +dev_kfree_skb_irq (lp->deferred_skb); lp->deferred_skb =NULL ; dev->stats.tx_errors++; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 224/658 net: ethernet: dnet: dont call dev_kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f07fadcbee2a5e84caa67c7c445424200bffb60b ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
In this case, the lock is used to protected 'bp', so we can move dev_kfree_skb() after the spin_unlock_irqrestore().
--- drivers/net/ethernet/dnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/dnet.c +2 -2
@@ -553,11 +553,11 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)skb_tx_timestamp (skb); +spin_unlock_irqrestore (&bp->lock, flags); +/* free the buffer */ dev_kfree_skb (skb); -spin_unlock_irqrestore (&bp->lock, flags); -return NETDEV_TX_OK ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 225/658 hamradio: dont call dev_kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 3727f742915f04f6fc550b80cf406999bd4e90d0 ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal.
In scc_discard_buffers(), dev_kfree_skb() is called to discard the SKBs, so replace it with dev_kfree_skb_irq().
In scc_net_tx(), dev_kfree_skb() is called to drop the SKB that exceed queue length, so replace it with dev_kfree_skb_irq().
--- drivers/net/hamradio/scc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/hamradio/scc.c +3 -3
@@ -300,12 +300,12 @@ static inline void scc_discard_buffers(struct scc_channel *scc)spin_lock_irqsave (&scc->lock, flags);if (scc->tx_buff !=NULL ) { -dev_kfree_skb (scc->tx_buff); +dev_kfree_skb_irq (scc->tx_buff); scc->tx_buff =NULL ; }while (!skb_queue_empty (&scc->tx_queue)) -dev_kfree_skb (skb_dequeue (&scc->tx_queue)); +dev_kfree_skb_irq (skb_dequeue (&scc->tx_queue));spin_unlock_irqrestore (&scc->lock, flags); }
@@ -1667,7 +1667,7 @@ static netdev_tx_t scc_net_tx(struct sk_buff *skb, struct net_device *dev)if (skb_queue_len (&scc->tx_queue) > scc->dev->tx_queue_len) {struct sk_buff *skb_del; skb_del =skb_dequeue (&scc->tx_queue); -dev_kfree_skb (skb_del); +dev_kfree_skb_irq (skb_del); }skb_queue_tail (&scc->tx_queue, skb);netif_trans_update (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 226/658 net: amd: lance: dont call dev_kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 6151d105dfce8c23edf30eed35e97f3d9b96a35c ]
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled.
It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal.
In these two cases, dev_kfree_skb() is called consume the xmited SKB, so replace it with dev_consume_skb_irq().
--- drivers/net/ethernet/amd/atarilance.c | 2 +- drivers/net/ethernet/amd/lance.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/amd/atarilance.c +1 -1
@@ -825,7 +825,7 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev) lp->memcpy_f (PKTBUF_ADDR (head), (void *)skb->data, skb->len ); head->flag =TMD1_OWN_CHIP |TMD1_ENP |TMD1_STP ; dev->stats.tx_bytes += skb->len; -dev_kfree_skb ( skb ); +dev_consume_skb_irq (skb); lp->cur_tx++;while ( lp->cur_tx >=TX_RING_SIZE && lp->dirty_tx >=TX_RING_SIZE ) { lp->cur_tx -=TX_RING_SIZE ;
drivers/net/ethernet/amd/lance.c +1 -1
@@ -997,7 +997,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb,skb_copy_from_linear_data (skb, &lp->tx_bounce_buffs[entry], skb->len); lp->tx_ring[entry].base = ((u32 )isa_virt_to_bus ((lp->tx_bounce_buffs + entry)) &0xffffff ) |0x83000000 ; -dev_kfree_skb (skb); +dev_consume_skb_irq (skb); }else { lp->tx_skbuff[entry] = skb; lp->tx_ring[entry].base = ((u32 )isa_virt_to_bus (skb->data) &0xffffff ) |0x83000000 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 227/658 net: amd-xgbe: Fix logic around active and passive cables
In reply to Greg Kroah-HartmanFrom: Tom Lendacky <[email protected]>
[ Upstream commit 4998006c73afe44e2f639d55bd331c6c26eb039f ]
SFP+ active and passive cables are copper cables with fixed SFP+ end connectors. Due to a misinterpretation of this, SFP+ active cables could end up not being recognized, causing the driver to fail to establish a connection.
Introduce a new enum in SFP+ cable types, XGBE_SFP_CABLE_FIBER, that is the default cable type, and handle active and passive cables when they are specifically detected.
--- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +6 -3
@@ -188,6 +188,7 @@ enum xgbe_sfp_cable {XGBE_SFP_CABLE_UNKNOWN =0 ,XGBE_SFP_CABLE_ACTIVE ,XGBE_SFP_CABLE_PASSIVE , + XGBE_SFP_CABLE_FIBER, }; enum xgbe_sfp_base {
@@ -1148,16 +1149,18 @@ static void xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) phy_data->sfp_tx_fault =xgbe_phy_check_sfp_tx_fault (phy_data); phy_data->sfp_rx_los =xgbe_phy_check_sfp_rx_los (phy_data); -/* Assume ACTIVE cable unless told it is PASSIVE */ +/* Assume FIBER cable unless told otherwise */ if (sfp_base[XGBE_SFP_BASE_CABLE ] &XGBE_SFP_BASE_CABLE_PASSIVE ) { phy_data->sfp_cable =XGBE_SFP_CABLE_PASSIVE ; phy_data->sfp_cable_len = sfp_base[XGBE_SFP_BASE_CU_CABLE_LEN ]; - }else { + }else if (sfp_base[XGBE_SFP_BASE_CABLE ] &XGBE_SFP_BASE_CABLE_ACTIVE ) { phy_data->sfp_cable =XGBE_SFP_CABLE_ACTIVE ; + }else { + phy_data->sfp_cable =XGBE_SFP_CABLE_FIBER ; }/* Determine the type of SFP */ -if (phy_data->sfp_cable ==XGBE_SFP_CABLE_PASSIVE && +if (phy_data->sfp_cable !=XGBE_SFP_CABLE_FIBER &&xgbe_phy_sfp_bit_rate (sfp_eeprom,XGBE_SFP_SPEED_10000 )) phy_data->sfp_base =XGBE_SFP_BASE_10000_CR ;else if (sfp_base[XGBE_SFP_BASE_10GBE_CC ] &XGBE_SFP_BASE_10GBE_CC_SR )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 228/658 net: amd-xgbe: Check only the minimum speed for active/passive cables
In reply to Greg Kroah-HartmanFrom: Tom Lendacky <[email protected]>
[ Upstream commit f8ab263d4d48e6dab752029bf562f20a2ee630ed ]
There are cables that exist that can support speeds in excess of 10GbE. The driver, however, restricts the EEPROM advertised nominal bitrate to a specific range, which can prevent usage of cables that can support, for example, up to 25GbE.
Rather than checking that an active or passive cable supports a specific range, only check for a minimum supported speed.
--- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +2 -12
@@ -236,10 +236,7 @@ enum xgbe_sfp_speed {#define XGBE_SFP_BASE_BR 12#define XGBE_SFP_BASE_BR_1GBE_MIN 0x0a -#define XGBE_SFP_BASE_BR_1GBE_MAX 0x0d#define XGBE_SFP_BASE_BR_10GBE_MIN 0x64 -#define XGBE_SFP_BASE_BR_10GBE_MAX 0x68 -#define XGBE_MOLEX_SFP_BASE_BR_10GBE_MAX 0x78#define XGBE_SFP_BASE_CU_CABLE_LEN 18
@@ -826,29 +823,22 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata)static bool xgbe_phy_sfp_bit_rate (struct xgbe_sfp_eeprom *sfp_eeprom,enum xgbe_sfp_speed sfp_speed) { -u8 *sfp_base, min, max; +u8 *sfp_base, min; sfp_base = sfp_eeprom->base;switch (sfp_speed) {case XGBE_SFP_SPEED_1000 : min =XGBE_SFP_BASE_BR_1GBE_MIN ; - max =XGBE_SFP_BASE_BR_1GBE_MAX ;break ;case XGBE_SFP_SPEED_10000 : min =XGBE_SFP_BASE_BR_10GBE_MIN ; -if (memcmp (&sfp_eeprom->base[XGBE_SFP_BASE_VENDOR_NAME ], -XGBE_MOLEX_VENDOR ,XGBE_SFP_BASE_VENDOR_NAME_LEN ) ==0 ) - max =XGBE_MOLEX_SFP_BASE_BR_10GBE_MAX ; -else - max =XGBE_SFP_BASE_BR_10GBE_MAX ;break ;default :return false; } -return ((sfp_base[XGBE_SFP_BASE_BR ] >= min) && - (sfp_base[XGBE_SFP_BASE_BR ] <= max)); +return sfp_base[XGBE_SFP_BASE_BR ] >= min; }static void xgbe_phy_free_phy_device (struct xgbe_prv_data *pdata)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 229/658 can: tcan4x5x: Remove invalid write in clear_interrupts
In reply to Greg Kroah-HartmanFrom: Markus Schneider-Pargmann <[email protected]>
[ Upstream commit 40c9e4f676abbe194541d88e796341c92d5a13c0 ]
Register 0x824 TCAN4X5X_MCAN_INT_REG is a read-only register. Any writes to this register do not have any effect.
Remove this write. The m_can driver aldready clears the interrupts in m_can_isr() by writing to M_CAN_IR which is translated to register 0x1050 which is a writable version of this register.
--- drivers/net/can/m_can/tcan4x5x.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/can/m_can/tcan4x5x.c +0 -5
@@ -291,11 +291,6 @@ static int tcan4x5x_clear_interrupts(struct m_can_classdev *cdev)if (ret)return ret; - ret =tcan4x5x_write_tcan_reg (cdev,TCAN4X5X_MCAN_INT_REG , -TCAN4X5X_ENABLE_MCAN_INT ); -if (ret) -return ret; - ret =tcan4x5x_write_tcan_reg (cdev,TCAN4X5X_INT_FLAGS ,TCAN4X5X_CLEAR_ALL_INT );if (ret)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 230/658 net: lan9303: Fix read error execution path
In reply to Greg Kroah-HartmanFrom: Jerry Ray <[email protected]>
[ Upstream commit 8964916d206071b058c6351f88b1966bd58cbde0 ]
This patch fixes an issue where a read failure of a port statistic counter will return unknown results. While it is highly unlikely the read will ever fail, it is much cleaner to return a zero for the stat count.
--- drivers/net/dsa/lan9303-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/dsa/lan9303-core.c +3 -1
@@ -1001,9 +1001,11 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port, ret =lan9303_read_switch_port ( chip, port, lan9303_mib[u].offset, ®); -if (ret) +if (ret) {dev_warn (chip->dev,"Reading status port %d reg %u failed\n" , port, lan9303_mib[u].offset); + reg =0 ; + } data[u] = reg; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 231/658 ntb_netdev: Use dev_kfree_skb_any() in interrupt context
In reply to Greg Kroah-HartmanFrom: Eric Pilmore <[email protected]>
[ Upstream commit 5f7d78b2b12a9d561f48fa00bab29b40f4616dad ]
TX/RX callback handlers (ntb_netdev_tx_handler(), ntb_netdev_rx_handler()) can be called in interrupt context via the DMA framework when the respective DMA operations have completed. As such, any calls by these routines to free skb's, should use the interrupt context safe dev_kfree_skb_any() function.
Previously, these callback handlers would call the interrupt unsafe version of dev_kfree_skb(). This has not presented an issue on Intel IOAT DMA engines as that driver utilizes tasklets rather than a hard interrupt handler, like the AMD PTDMA DMA driver. On AMD systems, a kernel WARNING message is encountered, which is being issued from skb_release_head_state() due to in_hardirq() being true.
Besides the user visible WARNING from the kernel, the other symptom of this bug was that TCP/IP performance across the ntb_netdev interface was very poor, i.e. approximately an order of magnitude below what was expected. With the repair to use dev_kfree_skb_any(), kernel WARNINGs from skb_release_head_state() ceased and TCP/IP performance, as measured by iperf, was on par with expected results, approximately 20 Gb/s on AMD Milan based server. Note that this performance is comparable with Intel based servers.
--- drivers/net/ntb_netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ntb_netdev.c +2 -2
@@ -137,7 +137,7 @@ static void ntb_netdev_rx_handler(struct ntb_transport_qp *qp, void *qp_data, enqueue_again: rc =ntb_transport_rx_enqueue (qp, skb, skb->data, ndev->mtu +ETH_HLEN );if (rc) { -dev_kfree_skb (skb); +dev_kfree_skb_any (skb); ndev->stats.rx_errors++; ndev->stats.rx_fifo_errors++; }
@@ -192,7 +192,7 @@ static void ntb_netdev_tx_handler(struct ntb_transport_qp *qp, void *qp_data, ndev->stats.tx_aborted_errors++; } -dev_kfree_skb (skb); +dev_kfree_skb_any (skb);if (ntb_transport_tx_free_entry (dev->qp) >= tx_start) {/* Make sure anybody stopping the queue after this sees the new
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 232/658 Bluetooth: btusb: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b15a6bd3c80c77faec8317319b97f976b1a08332 ]
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave().
--- drivers/bluetooth/btusb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bluetooth/btusb.c +3 -3
@@ -563,13 +563,13 @@ static inline void btusb_free_frags(struct btusb_data *data)spin_lock_irqsave (&data->rxlock, flags); -kfree_skb (data->evt_skb); +dev_kfree_skb_irq (data->evt_skb); data->evt_skb =NULL ; -kfree_skb (data->acl_skb); +dev_kfree_skb_irq (data->acl_skb); data->acl_skb =NULL ; -kfree_skb (data->sco_skb); +dev_kfree_skb_irq (data->sco_skb); data->sco_skb =NULL ;spin_unlock_irqrestore (&data->rxlock, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 233/658 Bluetooth: hci_qca: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit df4cfc91208e0a98f078223793f5871b1a82cc54 ]
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave().
--- drivers/bluetooth/hci_qca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_qca.c +1 -1
@@ -816,7 +816,7 @@ static int qca_enqueue(struct hci_uart *hu, struct sk_buff *skb)default :BT_ERR ("Illegal tx state: %d (losing packet)" , qca->tx_ibs_state); -kfree_skb (skb); +dev_kfree_skb_irq (skb);break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 234/658 Bluetooth: hci_ll: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 8f458f783dfbb19c1f1cb58ed06eeb701f52091b ]
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave().
--- drivers/bluetooth/hci_ll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_ll.c +1 -1
@@ -345,7 +345,7 @@ static int ll_enqueue(struct hci_uart *hu, struct sk_buff *skb)default :BT_ERR ("illegal hcill state: %ld (losing packet)" , ll->hcill_state); -kfree_skb (skb); +dev_kfree_skb_irq (skb);break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 235/658 Bluetooth: hci_h5: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 383630cc6758d619874c2e8bb2f68a61f3f9ef6e ]
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave().
--- drivers/bluetooth/hci_h5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_h5.c +1 -1
@@ -298,7 +298,7 @@ static void h5_pkt_cull(struct h5 *h5)break ;__skb_unlink (skb, &h5->unack); -kfree_skb (skb); +dev_kfree_skb_irq (skb); }if (skb_queue_empty (&h5->unack))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 236/658 Bluetooth: hci_bcsp: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 7b503e339c1a80bf0051ec2d19c3bc777014ac61 ]
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave().
--- drivers/bluetooth/hci_bcsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_bcsp.c +1 -1
@@ -378,7 +378,7 @@ static void bcsp_pkt_cull(struct bcsp_struct *bcsp) i++;__skb_unlink (skb, &bcsp->unack); -kfree_skb (skb); +dev_kfree_skb_irq (skb); }if (skb_queue_empty (&bcsp->unack))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 237/658 Bluetooth: hci_core: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 39c1eb6fcbae8ce9bb71b2ac5cb609355a2b181b ]
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave().
--- net/bluetooth/hci_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_core.c +1 -1
@@ -4455,7 +4455,7 @@ void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status, *req_complete_skb =bt_cb (skb)->hci.req_complete_skb; else *req_complete =bt_cb (skb)->hci.req_complete; -kfree_skb (skb); +dev_kfree_skb_irq (skb); }spin_unlock_irqrestore (&hdev->cmd_q.lock, flags); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 238/658 Bluetooth: RFCOMM: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0ba18967d4544955b2eff2fbc4f2a8750c4df90a ]
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So replace kfree_skb() with dev_kfree_skb_irq() under spin_lock_irqsave().
--- net/bluetooth/rfcomm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/rfcomm/core.c +1 -1
@@ -594,7 +594,7 @@ int rfcomm_dlc_send(struct rfcomm_dlc *d, struct sk_buff *skb) ret =rfcomm_dlc_send_frag (d, frag);if (ret <0 ) { -kfree_skb (frag); +dev_kfree_skb_irq (frag); goto unlock; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 239/658 stmmac: fix potential division by 0
In reply to Greg Kroah-HartmanFrom: Piergiorgio Beruto <[email protected]>
[ Upstream commit ede5a389852d3640a28e7187fb32b7f204380901 ]
When the MAC is connected to a 10 Mb/s PHY and the PTP clock is derived from the MAC reference clock (default), the clk_ptp_rate becomes too small and the calculated sub second increment becomes 0 when computed by the stmmac_config_sub_second_increment() function within stmmac_init_tstamp_counter().
Therefore, the subsequent div_u64 in stmmac_init_tstamp_counter() operation triggers a divide by 0 exception as shown below.
[ 95.062067] socfpga-dwmac ff700000.ethernet eth0: Register MEM_TYPE_PAGE_POOL RxQ-0 [ 95.076440] socfpga-dwmac ff700000.ethernet eth0: PHY [stmmac-0:08] driver [NCN26000] (irq=49) [ 95.095964] dwmac1000: Master AXI performs any burst length [ 95.101588] socfpga-dwmac ff700000.ethernet eth0: No Safety Features support found [ 95.109428] Division by zero in kernel. [ 95.113447] CPU: 0 PID: 239 Comm: ifconfig Not tainted 6.1.0-rc7-centurion3-1.0.3.0-01574-gb624218205b7-dirty #77 [ 95.123686] Hardware name: Altera SOCFPGA [ 95.127695] unwind_backtrace from show_stack+0x10/0x14 [ 95.132938] show_stack from dump_stack_lvl+0x40/0x4c [ 95.137992] dump_stack_lvl from Ldiv0+0x8/0x10 [ 95.142527] Ldiv0 from __aeabi_uidivmod+0x8/0x18 [ 95.147232] __aeabi_uidivmod from div_u64_rem+0x1c/0x40 [ 95.152552] div_u64_rem from stmmac_init_tstamp_counter+0xd0/0x164 [ 95.158826] stmmac_init_tstamp_counter from stmmac_hw_setup+0x430/0xf00 [ 95.165533] stmmac_hw_setup from __stmmac_open+0x214/0x2d4 [ 95.171117] __stmmac_open from stmmac_open+0x30/0x44 [ 95.176182] stmmac_open from __dev_open+0x11c/0x134 [ 95.181172] __dev_open from __dev_change_flags+0x168/0x17c [ 95.186750] __dev_change_flags from dev_change_flags+0x14/0x50 [ 95.192662] dev_change_flags from devinet_ioctl+0x2b4/0x604 [ 95.198321] devinet_ioctl from inet_ioctl+0x1ec/0x214 [ 95.203462] inet_ioctl from sock_ioctl+0x14c/0x3c4 [ 95.208354] sock_ioctl from vfs_ioctl+0x20/0x38 [ 95.212984] vfs_ioctl from sys_ioctl+0x250/0x844 [ 95.217691] sys_ioctl from ret_fast_syscall+0x0/0x4c [ 95.222743] Exception stack(0xd0ee1fa8 to 0xd0ee1ff0) [ 95.227790] 1fa0: 00574c4f be9aeca4 00000003 00008914 be9aeca4 be9aec50 [ 95.235945] 1fc0: 00574c4f be9aeca4 0059f078 00000036 be9aee8c be9aef7a 00000015 00000000 [ 95.244096] 1fe0: 005a01f0 be9aec38 004d7484 b6e67d74
--- drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 3 ++- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +2 -1
@@ -43,7 +43,8 @@ static void config_sub_second_increment(void __iomem *ioaddr,if (!(value &PTP_TCR_TSCTRLSSR )) data = (data *1000 ) /465 ; - data &=PTP_SSIR_SSINC_MASK ; +if (data >PTP_SSIR_SSINC_MAX ) + data =PTP_SSIR_SSINC_MAX ; reg_value = data;if (gmac4)
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h +1 -1
@@ -61,7 +61,7 @@#define PTP_TCR_TSENMACADDR BIT(18)/* SSIR defines */ -#define PTP_SSIR_SSINC_MASK 0xff +#define PTP_SSIR_SSINC_MAX 0xff#define GMAC4_PTP_SSIR_SSINC_SHIFT 16#endif /* __STMMAC_PTP_H__ */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 240/658 apparmor: fix a memleak in multi_transaction_new()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit c73275cf6834787ca090317f1d20dbfa3b7f05aa ]
In multi_transaction_new(), the variable t is not freed or passed out on the failure of copy_from_user(t->data, buf, size), which could lead to a memleak.
Fix this bug by adding a put_multi_transaction(t) in the error path.
--- security/apparmor/apparmorfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
security/apparmor/apparmorfs.c +3 -1
@@ -869,8 +869,10 @@ static struct multi_transaction *multi_transaction_new(struct file *file,if (!t)return ERR_PTR (-ENOMEM );kref_init (&t->count); -if (copy_from_user (t->data, buf, size)) +if (copy_from_user (t->data, buf, size)) { +put_multi_transaction (t);return ERR_PTR (-EFAULT ); + }return t; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 241/658 apparmor: fix lockdep warning when removing a namespace
In reply to Greg Kroah-HartmanFrom: John Johansen <[email protected]>
[ Upstream commit 9c4557efc558a68e4cd973490fd936d6e3414db8 ]
Fix the following lockdep warning
[ 1119.158984] ============================================
[ 1119.158988] WARNING: possible recursive locking detected
[ 1119.158996] 6.0.0-rc1+ #257 Tainted: G E N
[ 1119.158999] --------------------------------------------
[ 1119.159001] bash/80100 is trying to acquire lock:
[ 1119.159007] ffff88803e79b4a0 (&ns->lock/1){+.+.}-{4:4}, at: destroy_ns.part.0+0x43/0x140
[ 1119.159028]
but task is already holding lock:
[ 1119.159030] ffff8881009764a0 (&ns->lock/1){+.+.}-{4:4}, at: aa_remove_profiles+0x3f0/0x640
[ 1119.159040]
other info that might help us debug this:
[ 1119.159042] Possible unsafe locking scenario:[ 1119.159043] CPU0
[ 1119.159045] ----
[ 1119.159047] lock(&ns->lock/1);
[ 1119.159051] lock(&ns->lock/1);
[ 1119.159055]
*** DEADLOCK ***Which is caused by an incorrect lockdep nesting notation
--- security/apparmor/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/apparmor/policy.c +1 -1
@@ -1123,7 +1123,7 @@ ssize_t aa_remove_profiles(struct aa_ns *policy_ns, struct aa_label *subj,if (!name) {/* remove namespace - can only happen if fqname[0] == ':' */ -mutex_lock_nested (&ns->parent->lock, ns->level); +mutex_lock_nested (&ns->parent->lock, ns->parent->level);__aa_bump_ns_revision (ns);__aa_remove_ns (ns);mutex_unlock (&ns->parent->lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 242/658 apparmor: Fix abi check to include v8 abi
In reply to Greg Kroah-HartmanFrom: John Johansen <[email protected]>
[ Upstream commit 1b5a6198f5a9d0aa5497da0dc4bcd4fc166ee516 ]
The v8 abi is supported by the kernel but the userspace supported version check does not allow for it. This was missed when v8 was added due to a bug in the userspace compiler which was setting an older abi version for v8 encoding (which is forward compatible except on the network encoding). However it is possible to detect the network encoding by checking the policydb network support which the code does. The end result was that missing the abi flag worked until userspace was fixed and began correctly checking for the v8 abi version.
--- security/apparmor/policy_unpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/apparmor/policy_unpack.c +1 -1
@@ -955,7 +955,7 @@ static int verify_header(struct aa_ext *e, int required, const char **ns)* if not specified use previous version * Mask off everything that is not kernel abi version */ -if (VERSION_LT (e->version, v5) ||VERSION_GT (e->version, v7)) { +if (VERSION_LT (e->version, v5) ||VERSION_GT (e->version, v8)) {audit_iface (NULL ,NULL ,NULL ,"unsupported interface version" , e, error);return error;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 243/658 apparmor: Use pointer to struct aa_label for lbs_cred
In reply to Greg Kroah-HartmanFrom: Xiu Jianfeng <[email protected]>
[ Upstream commit 37923d4321b1e38170086da2c117f78f2b0f49c6 ]
According to the implementations of cred_label() and set_cred_label(), we should use pointer to struct aa_label for lbs_cred instead of struct aa_task_ctx, this patch fixes it.
--- security/apparmor/lsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/apparmor/lsm.c +2 -2
@@ -1148,10 +1148,10 @@ static int apparmor_inet_conn_request(struct sock *sk, struct sk_buff *skb,#endif /* -* The cred blob is a pointer to, not an instance of, an aa_task_ctx. +* The cred blob is a pointer to, not an instance of, an aa_label. */ struct lsm_blob_sizes apparmor_blob_sizes __lsm_ro_after_init = { - .lbs_cred =sizeof (struct aa_task_ctx *), + .lbs_cred =sizeof (struct aa_label *), .lbs_file =sizeof (struct aa_file_ctx ), .lbs_task =sizeof (struct aa_task_ctx ), };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 244/658 RDMA/core: Fix order of nldev_exit call
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 4508d32ccced24c972bc4592104513e1ff8439b5 ]
Create symmetrical exit flow by calling to nldev_exit() after call to rdma_nl_unregister(RDMA_NL_LS).
--- drivers/infiniband/core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/device.c +1 -1
@@ -2796,8 +2796,8 @@ static int __init ib_core_init(void) static void __exit ib_core_cleanup(void) {roce_gid_mgmt_cleanup (); -nldev_exit ();rdma_nl_unregister (RDMA_NL_LS ); +nldev_exit ();unregister_pernet_device (&rdma_dev_net_ops);unregister_blocking_lsm_notifier (&ibdev_lsm_nb);ib_sa_cleanup ();
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 245/658 f2fs: fix normal discard process
In reply to Greg Kroah-HartmanFrom: Dongdong Zhang <[email protected]>
[ Upstream commit b5f1a218ae5e4339130d6e733f0e63d623e09a2c ]
In the DPOLICY_BG mode, there is a conflict between the two conditions "i + 1 < dpolicy->granularity" and "i < DEFAULT_DISCARD_GRANULARITY". If i = 15, the first condition is false, it will enter the second condition and dispatch all small granularity discards in function
__issue_discard_cmd_orderly. The restrictive effect
of the first condition to small discards will be invalidated. These two conditions should align.
--- fs/f2fs/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/segment.c +1 -1
@@ -1486,7 +1486,7 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,if (i +1 < dpolicy->granularity)break ; -if (i <DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered) +if (i +1 <DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered)return __issue_discard_cmd_orderly (sbi, dpolicy); pend_list = &dcc->pend_list[i];
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 246/658 RDMA/siw: Fix immediate work request flush to completion queue
In reply to Greg Kroah-HartmanFrom: Bernard Metzler <[email protected]>
[ Upstream commit bdf1da5df9da680589a7f74448dd0a94dd3e1446 ]
Correctly set send queue element opcode during immediate work request flushing in post sendqueue operation, if the QP is in ERROR state. An undefined ocode value results in out-of-bounds access to an array for mapping the opcode between siw internal and RDMA core representation in work completion generation. It resulted in a KASAN BUG report of type 'global-out-of-bounds' during NFSoRDMA testing.
This patch further fixes a potential case of a malicious user which may write undefined values for completion queue elements status or opcode, if the CQ is memory mapped to user land. It avoids the same out-of-bounds access to arrays for status and opcode mapping as described above.
--- drivers/infiniband/sw/siw/siw_cq.c | 24 ++++++++++++++-- drivers/infiniband/sw/siw/siw_verbs.c | 40 ++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 6 deletions(-)
drivers/infiniband/sw/siw/siw_cq.c +22 -2
@@ -56,8 +56,6 @@ int siw_reap_cqe(struct siw_cq *cq, struct ib_wc *wc)if (READ_ONCE (cqe->flags) &SIW_WQE_VALID ) {memset (wc,0 ,sizeof (*wc)); wc->wr_id = cqe->id; - wc->status = map_cqe_status[cqe->status].ib; - wc->opcode = map_wc_opcode[cqe->opcode]; wc->byte_len = cqe->bytes;/*
@@ -71,10 +69,32 @@ int siw_reap_cqe(struct siw_cq *cq, struct ib_wc *wc) wc->wc_flags =IB_WC_WITH_INVALIDATE ; } wc->qp = cqe->base_qp; + wc->opcode = map_wc_opcode[cqe->opcode]; + wc->status = map_cqe_status[cqe->status].ib;siw_dbg_cq (cq,"idx %u, type %d, flags %2x, id 0x%pK\n" , cq->cq_get % cq->num_cqe, cqe->opcode, cqe->flags, (void *)(uintptr_t )cqe->id); + }else { +/* +* A malicious user may set invalid opcode or +* status in the user mmapped CQE array. +* Sanity check and correct values in that case +* to avoid out-of-bounds access to global arrays +* for opcode and status mapping. +*/ +u8 opcode = cqe->opcode; +u16 status = cqe->status; + +if (opcode >=SIW_NUM_OPCODES ) { + opcode =0 ; + status =IB_WC_GENERAL_ERR ; + }else if (status >=SIW_NUM_WC_STATUS ) { + status =IB_WC_GENERAL_ERR ; + } + wc->opcode = map_wc_opcode[opcode]; + wc->status = map_cqe_status[status].ib; + }WRITE_ONCE (cqe->flags,0 ); cq->cq_get++;
drivers/infiniband/sw/siw/siw_verbs.c +36 -4
@@ -694,13 +694,45 @@ static int siw_copy_inline_sgl(const struct ib_send_wr *core_wr,static int siw_sq_flush_wr (struct siw_qp *qp,const struct ib_send_wr *wr,const struct ib_send_wr **bad_wr) { -struct siw_sqe sqe = {};int rv =0 ;while (wr) { - sqe.id = wr->wr_id; - sqe.opcode = wr->opcode; - rv =siw_sqe_complete (qp, &sqe,0 ,SIW_WC_WR_FLUSH_ERR ); +struct siw_sqe sqe = {}; + +switch (wr->opcode) { +case IB_WR_RDMA_WRITE : + sqe.opcode =SIW_OP_WRITE ; +break ; +case IB_WR_RDMA_READ : + sqe.opcode =SIW_OP_READ ; +break ; +case IB_WR_RDMA_READ_WITH_INV : + sqe.opcode =SIW_OP_READ_LOCAL_INV ; +break ; +case IB_WR_SEND : + sqe.opcode =SIW_OP_SEND ; +break ; +case IB_WR_SEND_WITH_IMM : + sqe.opcode =SIW_OP_SEND_WITH_IMM ; +break ; +case IB_WR_SEND_WITH_INV : + sqe.opcode =SIW_OP_SEND_REMOTE_INV ; +break ; +case IB_WR_LOCAL_INV : + sqe.opcode =SIW_OP_INVAL_STAG ; +break ; +case IB_WR_REG_MR : + sqe.opcode =SIW_OP_REG_MR ; +break ; +default : + rv = -EINVAL ; +break ; + } +if (!rv) { + sqe.id = wr->wr_id; + rv =siw_sqe_complete (qp, &sqe,0 , +SIW_WC_WR_FLUSH_ERR ); + }if (rv) {if (bad_wr) *bad_wr = wr;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 247/658 RDMA/nldev: Return "-EAGAIN" if the cm_id isnt from expected port
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit ecacb3751f254572af0009b9501e2cdc83a30b6a ]
When filling a cm_id entry, return "-EAGAIN" instead of 0 if the cm_id doesn'the have the same port as requested, otherwise an incomplete entry may be returned, which causes "rdam res show cm_id" to return an error.
For example on a machine with two rdma devices with "rping -C 1 -v -s" running background, the "rdma" command fails:
$ rdma -V rdma utility, iproute2-5.19.0 $ rdma res show cm_id link mlx5_0/- cm-idn 0 state LISTEN ps TCP pid 28056 comm rping src-addr 0.0.0.0:7174 error: Protocol not available
While with this fix it succeeds:
$ rdma res show cm_id link mlx5_0/- cm-idn 0 state LISTEN ps TCP pid 26395 comm rping src-addr 0.0.0.0:7174 link mlx5_1/- cm-idn 0 state LISTEN ps TCP pid 26395 comm rping src-addr 0.0.0.0:7174
--- drivers/infiniband/core/nldev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/nldev.c +1 -1
@@ -493,7 +493,7 @@ static int fill_res_cm_id_entry(struct sk_buff *msg, bool has_cap_net_admin,struct rdma_cm_id *cm_id = &id_priv->id;if (port && port != cm_id->port_num) -return 0 ; +return -EAGAIN ;if (cm_id->port_num &&nla_put_u32 (msg,RDMA_NLDEV_ATTR_PORT_INDEX , cm_id->port_num))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 248/658 RDMA/siw: Set defined status for work completion with undefined status
In reply to Greg Kroah-HartmanFrom: Bernard Metzler <[email protected]>
[ Upstream commit 60da2d11fcbc043304910e4d2ca82f9bab953e63 ]
A malicious user may write undefined values into memory mapped completion queue elements status or opcode. Undefined status or opcode values will result in out-of-bounds access to an array mapping siw internal representation of opcode and status to RDMA core representation when reaping CQ elements. While siw detects those undefined values, it did not correctly set completion status to a defined value, thus defeating the whole purpose of the check.
This bug leads to the following Smatch static checker warning:
drivers/infiniband/sw/siw/siw_cq.c:96 siw_reap_cqe()
error: buffer overflow 'map_cqe_status' 10 <= 21
--- drivers/infiniband/sw/siw/siw_cq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/siw/siw_cq.c +2 -2
@@ -88,9 +88,9 @@ int siw_reap_cqe(struct siw_cq *cq, struct ib_wc *wc)if (opcode >=SIW_NUM_OPCODES ) { opcode =0 ; - status =IB_WC_GENERAL_ERR ; + status =SIW_WC_GENERAL_ERR ; }else if (status >=SIW_NUM_WC_STATUS ) { - status =IB_WC_GENERAL_ERR ; + status =SIW_WC_GENERAL_ERR ; } wc->opcode = map_wc_opcode[opcode]; wc->status = map_cqe_status[status].ib;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 249/658 scsi: scsi_debug: Fix a warning in resp_write_scat()
In reply to Greg Kroah-HartmanFrom: Harshit Mogalapalli <[email protected]>
[ Upstream commit 216e179724c1d9f57a8ababf8bd7aaabef67f01b ]
As 'lbdof_blen' is coming from user, if the size in kzalloc() is >= MAX_ORDER then we hit a warning.
Call trace:
sg_ioctl
sg_ioctl_common
scsi_ioctl
sg_scsi_ioctl
blk_execute_rq
blk_mq_sched_insert_request
blk_mq_run_hw_queue
__blk_mq_delay_run_hw_queue
__blk_mq_run_hw_queue
blk_mq_sched_dispatch_requests
__blk_mq_sched_dispatch_requests
blk_mq_dispatch_rq_list
scsi_queue_rq
scsi_dispatch_cmd
scsi_debug_queuecommand
schedule_resp
resp_write_scatIf you try to allocate a memory larger than(>=) MAX_ORDER, then kmalloc() will definitely fail. It creates a stack trace and messes up dmesg. The user controls the size here so if they specify a too large size it will fail.
Add __GFP_NOWARN in order to avoid too large allocation warning. This is detected by static analysis using smatch.
--- drivers/scsi/scsi_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_debug.c +1 -1
@@ -3139,7 +3139,7 @@ static int resp_write_scat(struct scsi_cmnd *scp,mk_sense_buffer (scp,ILLEGAL_REQUEST ,INVALID_FIELD_IN_CDB ,0 );return illegal_condition_result; } - lrdp =kzalloc (lbdof_blen,GFP_ATOMIC ); + lrdp =kzalloc (lbdof_blen,GFP_ATOMIC | __GFP_NOWARN);if (lrdp ==NULL )return SCSI_MLQUEUE_HOST_BUSY ;if (sdebug_verbose)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 250/658 crypto: ccree - swap SHA384 and SHA512 larval hashes at build time
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit f08b58501c74d6ec0828b55a0d4e0b2e840c2b9e ]
Due to the way the hardware works, every double word in the SHA384 and SHA512 larval hashes must be swapped. Currently this is done at run time, during driver initialization.
However, this swapping can easily be done at build time. Treating each double word as two words has the benefit of changing the larval hashes' types from u64[] to u32[], like for all other hashes, and allows dropping the casts and size doublings when calling cc_set_sram_desc().
Stable-dep-of: 4f1c596df706 ("crypto: ccree - Remove debugfs when platform_driver_register failed")
--- drivers/crypto/ccree/cc_driver.c | 1 - drivers/crypto/ccree/cc_hash.c | 49 +++++++++++--------------------- drivers/crypto/ccree/cc_hash.h | 2 -- 3 files changed, 17 insertions(+), 35 deletions(-)
drivers/crypto/ccree/cc_driver.c +0 -1
@@ -653,7 +653,6 @@ static struct platform_driver ccree_driver = {static int __init ccree_init (void ) { -cc_hash_global_init ();cc_debugfs_global_init ();return platform_driver_register (&ccree_driver);
drivers/crypto/ccree/cc_hash.c +17 -32
73 lines not on this page · raw message
drivers/crypto/ccree/cc_hash.h +0 -2
@@ -104,6 +104,4 @@ cc_digest_len_addr(void *drvdata, u32 mode);*/ cc_sram_addr_t cc_larval_digest_addr (void *drvdata,u32 mode); -void cc_hash_global_init (void ); -#endif /*__CC_HASH_H__*/
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 251/658 crypto: ccree - Remove debugfs when platform_driver_register failed
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 4f1c596df706c9aca662b6c214fad84047ae2a97 ]
When platform_driver_register failed, we need to remove debugfs, which will caused a resource leak, fix it.
Failed logs as follows:
[ 32.606488] debugfs: Directory 'ccree' with parent '/' already present!
--- drivers/crypto/ccree/cc_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/crypto/ccree/cc_driver.c +9 -1
@@ -653,9 +653,17 @@ static struct platform_driver ccree_driver = {static int __init ccree_init (void ) { +int rc; +cc_debugfs_global_init (); -return platform_driver_register (&ccree_driver); + rc =platform_driver_register (&ccree_driver); +if (rc) { +cc_debugfs_global_fini (); +return rc; + } + +return 0 ; }module_init (ccree_init);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 252/658 PCI: Check for alloc failure in pci_request_irq()
In reply to Greg Kroah-HartmanFrom: Zeng Heng <[email protected]>
[ Upstream commit 2d9cd957d40c3ac491b358e7cff0515bb07a3a9c ]
When kvasprintf() fails to allocate memory, it returns a NULL pointer. Return error from pci_request_irq() so we don't dereference it.
--- drivers/pci/irq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/irq.c +2 -0
@@ -94,6 +94,8 @@ int pci_request_irq(struct pci_dev *dev, unsigned int nr, irq_handler_t handler,va_start (ap, fmt); devname =kvasprintf (GFP_KERNEL , fmt, ap);va_end (ap); +if (!devname) +return -ENOMEM ; ret =request_threaded_irq (pci_irq_vector (dev, nr), handler, thread_fn, irqflags, devname, dev_id);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 253/658 RDMA/hfi: Decrease PCI device reference count in error path
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit 9b51d072da1d27e1193e84708201c48e385ad912 ]
pci_get_device() will increase the reference count for the returned pci_dev, and also decrease the reference count for the input parameter *from* if it is not NULL.
If we break out the loop in node_affinity_init() with 'dev' not NULL, we need to call pci_dev_put() to decrease the reference count. Add missing pci_dev_put() in error path.
--- drivers/infiniband/hw/hfi1/affinity.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/hfi1/affinity.c +2 -0
@@ -218,6 +218,8 @@ int node_affinity_init(void)for (node =0 ; node < node_affinity.num_possible_nodes; node++) hfi1_per_node_cntr[node] =1 ; +pci_dev_put (dev); +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 254/658 crypto: ccree - Make cc_debugfs_global_fini() available for module init function
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 8e96729fc26c8967db45a3fb7a60387619f77a22 ]
ccree_init() calls cc_debugfs_global_fini(), the former is an init function and the latter an exit function though.
A modular build emits:
WARNING: modpost: drivers/crypto/ccree/ccree.o: section mismatch in reference: init_module (section: .init.text) -> cc_debugfs_global_fini (section: .exit.text)
(with CONFIG_DEBUG_SECTION_MISMATCH=y).
--- drivers/crypto/ccree/cc_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/ccree/cc_debugfs.c +1 -1
@@ -59,7 +59,7 @@ void __init cc_debugfs_global_init(void) cc_debugfs_dir =debugfs_create_dir ("ccree" ,NULL ); } -void __exit cc_debugfs_global_fini(void) +void cc_debugfs_global_fini (void ) {debugfs_remove (cc_debugfs_dir); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 255/658 RDMA/rxe: Fix NULL-ptr-deref in rxe_qp_do_cleanup() when socket create failed
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit f67376d801499f4fa0838c18c1efcad8840e550d ]
There is a null-ptr-deref when mount.cifs over rdma:
BUG: KASAN: null-ptr-deref in rxe_qp_do_cleanup+0x2f3/0x360 [rdma_rxe] Read of size 8 at addr 0000000000000018 by task mount.cifs/3046 CPU: 2 PID: 3046 Comm: mount.cifs Not tainted 6.1.0-rc5+ #62 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-1.fc3 Call Trace: <TASK> dump_stack_lvl+0x34/0x44 kasan_report+0xad/0x130 rxe_qp_do_cleanup+0x2f3/0x360 [rdma_rxe] execute_in_process_context+0x25/0x90 __rxe_cleanup+0x101/0x1d0 [rdma_rxe] rxe_create_qp+0x16a/0x180 [rdma_rxe] create_qp.part.0+0x27d/0x340 ib_create_qp_kernel+0x73/0x160 rdma_create_qp+0x100/0x230 _smbd_get_connection+0x752/0x20f0 smbd_get_connection+0x21/0x40 cifs_get_tcp_session+0x8ef/0xda0 mount_get_conns+0x60/0x750 cifs_mount+0x103/0xd00 cifs_smb3_do_mount+0x1dd/0xcb0 smb3_get_tree+0x1d5/0x300 vfs_get_tree+0x41/0xf0 path_mount+0x9b3/0xdd0 __x64_sys_mount+0x190/0x1d0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
The root cause of the issue is the socket create failed in rxe_qp_init_req().
So move the reset rxe_qp_do_cleanup() after the NULL ptr check.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +3 -3
@@ -842,12 +842,12 @@ static void rxe_qp_do_cleanup(struct work_struct *work) qp->resp.mr =NULL ; } -if (qp_type (qp) ==IB_QPT_RC ) -sk_dst_reset (qp->sk->sk); -free_rd_atomic_resources (qp);if (qp->sk) { +if (qp_type (qp) ==IB_QPT_RC ) +sk_dst_reset (qp->sk->sk); +kernel_sock_shutdown (qp->sk,SHUT_RDWR );sock_release (qp->sk); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 256/658 scsi: hpsa: Fix possible memory leak in hpsa_init_one()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 9c9ff300e0de07475796495d86f449340d454a0c ]
The hpda_alloc_ctlr_info() allocates h and its field reply_map. However, in hpsa_init_one(), if alloc_percpu() failed, the hpsa_init_one() jumps to clean1 directly, which frees h and leaks the h->reply_map.
Fix by calling hpda_free_ctlr_info() to release h->replay_map and h instead free h directly.
--- drivers/scsi/hpsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hpsa.c +1 -1
@@ -8903,7 +8903,7 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)destroy_workqueue (h->monitor_ctlr_wq); h->monitor_ctlr_wq =NULL ; } -kfree (h); +hpda_free_ctlr_info (h);return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 257/658 crypto: tcrypt - Fix multibuffer skcipher speed test mem leak
In reply to Greg Kroah-HartmanFrom: Zhang Yiqun <[email protected]>
[ Upstream commit 1aa33fc8d4032227253ceb736f47c52b859d9683 ]
In the past, the data for mb-skcipher test has been allocated twice, that means the first allcated memory area is without free, which may cause a potential memory leakage. So this patch is to remove one allocation to fix this error.
--- crypto/tcrypt.c | 9 --------- 1 file changed, 9 deletions(-)
crypto/tcrypt.c +0 -9
@@ -1281,15 +1281,6 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs, goto out_free_tfm; } - -for (i =0 ; i < num_mb; ++i) -if (testmgr_alloc_buf (data[i].xbuf)) { -while (i--) -testmgr_free_buf (data[i].xbuf); - goto out_free_tfm; - } - -for (i =0 ; i < num_mb; ++i) { data[i].req =skcipher_request_alloc (tfm,GFP_KERNEL );if (!data[i].req) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 258/658 scsi: mpt3sas: Fix possible resource leaks in mpt3sas_transport_port_add()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 78316e9dfc24906dd474630928ed1d3c562b568e ]
In mpt3sas_transport_port_add(), if sas_rphy_add() returns error, sas_rphy_free() needs be called to free the resource allocated in sas_end_device_alloc(). Otherwise a kernel crash will happen:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000108 CPU: 45 PID: 37020 Comm: bash Kdump: loaded Tainted: G W 6.1.0-rc1+ #189 pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : device_del+0x54/0x3d0 lr : device_del+0x37c/0x3d0 Call trace: device_del+0x54/0x3d0 attribute_container_class_device_del+0x28/0x38 transport_remove_classdev+0x6c/0x80 attribute_container_device_trigger+0x108/0x110 transport_remove_device+0x28/0x38 sas_rphy_remove+0x50/0x78 [scsi_transport_sas] sas_port_delete+0x30/0x148 [scsi_transport_sas] do_sas_phy_delete+0x78/0x80 [scsi_transport_sas] device_for_each_child+0x68/0xb0 sas_remove_children+0x30/0x50 [scsi_transport_sas] sas_rphy_remove+0x38/0x78 [scsi_transport_sas] sas_port_delete+0x30/0x148 [scsi_transport_sas] do_sas_phy_delete+0x78/0x80 [scsi_transport_sas] device_for_each_child+0x68/0xb0 sas_remove_children+0x30/0x50 [scsi_transport_sas] sas_remove_host+0x20/0x38 [scsi_transport_sas] scsih_remove+0xd8/0x420 [mpt3sas]
Because transport_add_device() is not called when sas_rphy_add() fails, the device is not added. When sas_rphy_remove() is subsequently called to remove the device in the remove() path, a NULL pointer dereference happens.
--- drivers/scsi/mpt3sas/mpt3sas_transport.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_transport.c +2 -0
@@ -712,6 +712,8 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle,if ((sas_rphy_add (rphy))) {ioc_err (ioc,"failure at %s:%d/%s()!\n" , __FILE__, __LINE__, __func__); +sas_rphy_free (rphy); + rphy =NULL ; }if (mpt3sas_port->remote_identify.device_type ==SAS_END_DEVICE ) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 259/658 scsi: hpsa: Fix error handling in hpsa_add_sas_host()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 4ef174a3ad9b5d73c1b6573e244ebba2b0d86eac ]
hpsa_sas_port_add_phy() does:
...
sas_phy_add() -> may return error here
sas_port_add_phy()
...
Whereas hpsa_free_sas_phy() does:
...
sas_port_delete_phy()
sas_phy_delete()
...
If hpsa_sas_port_add_phy() returns an error, hpsa_free_sas_phy() can not be called to free the memory because the port and the phy have not been added yet.
Replace hpsa_free_sas_phy() with sas_phy_free() and kfree() to avoid kernel crash in this case.
--- drivers/scsi/hpsa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/hpsa.c +2 -1
@@ -9763,7 +9763,8 @@ static int hpsa_add_sas_host(struct ctlr_info *h)return 0 ; free_sas_phy: -hpsa_free_sas_phy (hpsa_sas_phy); +sas_phy_free (hpsa_sas_phy->phy); +kfree (hpsa_sas_phy); free_sas_port:hpsa_free_sas_port (hpsa_sas_port); free_sas_node:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 260/658 scsi: hpsa: Fix possible memory leak in hpsa_add_sas_device()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit fda34a5d304d0b98cc967e8763b52221b66dc202 ]
If hpsa_sas_port_add_rphy() returns an error, the 'rphy' allocated in sas_end_device_alloc() needs to be freed. Address this by calling sas_rphy_free() in the error path.
--- drivers/scsi/hpsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/hpsa.c +3 -1
@@ -9800,10 +9800,12 @@ static int hpsa_add_sas_device(struct hpsa_sas_node *hpsa_sas_node, rc =hpsa_sas_port_add_rphy (hpsa_sas_port, rphy);if (rc) - goto free_sas_port; + goto free_sas_rphy;return 0 ; +free_sas_rphy: +sas_rphy_free (rphy); free_sas_port:hpsa_free_sas_port (hpsa_sas_port); device->sas_port =NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 261/658 scsi: fcoe: Fix possible name leak when device_register() fails
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 47b6a122c7b69a876c7ee2fc064a26b09627de9d ]
If device_register() returns an error, the name allocated by dev_set_name() needs to be freed. As the comment of device_register() says, one should use put_device() to give up the reference in the error path. Fix this by calling put_device(), then the name can be freed in kobject_cleanup().
The 'fcf' is freed in fcoe_fcf_device_release(), so the kfree() in the error path can be removed.
The 'ctlr' is freed in fcoe_ctlr_device_release(), so don't use the error label, just return NULL after calling put_device().
--- drivers/scsi/fcoe/fcoe_sysfs.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/scsi/fcoe/fcoe_sysfs.c +10 -9
@@ -830,14 +830,15 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,dev_set_name (&ctlr->dev,"ctlr_%d" , ctlr->id); error =device_register (&ctlr->dev); -if (error) - goto out_del_q2; +if (error) { +destroy_workqueue (ctlr->devloss_work_q); +destroy_workqueue (ctlr->work_q); +put_device (&ctlr->dev); +return NULL ; + }return ctlr; -out_del_q2: -destroy_workqueue (ctlr->devloss_work_q); - ctlr->devloss_work_q =NULL ; out_del_q:destroy_workqueue (ctlr->work_q); ctlr->work_q =NULL ;
@@ -1036,16 +1037,16 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr, fcf->selected = new_fcf->selected; error =device_register (&fcf->dev); -if (error) - goto out_del; +if (error) { +put_device (&fcf->dev); + goto out; + } fcf->state =FCOE_FCF_STATE_CONNECTED ;list_add_tail (&fcf->peers, &ctlr->fcfs);return fcf; -out_del: -kfree (fcf); out:return NULL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 262/658 scsi: ipr: Fix WARNING in ipr_init()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit e6f108bffc3708ddcff72324f7d40dfcd0204894 ]
ipr_init() will not call unregister_reboot_notifier() when pci_register_driver() fails, which causes a WARNING. Call unregister_reboot_notifier() when pci_register_driver() fails.
notifier callback ipr_halt [ipr] already registered
WARNING: CPU: 3 PID: 299 at kernel/notifier.c:29 notifier_chain_register+0x16d/0x230 Modules linked in: ipr(+) xhci_pci_renesas xhci_hcd ehci_hcd usbcore led_class gpu_sched drm_buddy video wmi drm_ttm_helper ttm drm_display_helper drm_kms_helper drm drm_panel_orientation_quirks agpgart cfbft CPU: 3 PID: 299 Comm: modprobe Tainted: G W 6.1.0-rc1-00190-g39508d23b672-dirty #332 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.15.0-0-g2dd4b9b3f840-prebuilt.qemu.org 04/01/2014 RIP: 0010:notifier_chain_register+0x16d/0x230 Call Trace: <TASK> __blocking_notifier_chain_register+0x73/0xb0 ipr_init+0x30/0x1000 [ipr] do_one_initcall+0xdb/0x480 do_init_module+0x1cf/0x680 load_module+0x6a50/0x70a0 __do_sys_finit_module+0x12f/0x1c0 do_syscall_64+0x3f/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
--- drivers/scsi/ipr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/scsi/ipr.c +9 -1
@@ -10843,11 +10843,19 @@ static struct notifier_block ipr_notifier = {**/ static int __init ipr_init (void ) { +int rc; +ipr_info ("IBM Power RAID SCSI Device Driver version: %s %s\n" ,IPR_DRIVER_VERSION ,IPR_DRIVER_DATE );register_reboot_notifier (&ipr_notifier); -return pci_register_driver (&ipr_driver); + rc =pci_register_driver (&ipr_driver); +if (rc) { +unregister_reboot_notifier (&ipr_notifier); +return rc; + } + +return 0 ; }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 263/658 scsi: fcoe: Fix transport not deattached when fcoe_if_init() fails
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 4155658cee394b22b24c6d64e49247bf26d95b92 ]
fcoe_init() calls fcoe_transport_attach(&fcoe_sw_transport), but when fcoe_if_init() fails, &fcoe_sw_transport is not detached and leaves freed &fcoe_sw_transport on fcoe_transports list. This causes panic when reinserting module.
BUG: unable to handle page fault for address: fffffbfff82e2213 RIP: 0010:fcoe_transport_attach+0xe1/0x230 [libfcoe] Call Trace: <TASK> do_one_initcall+0xd0/0x4e0 load_module+0x5eee/0x7210 ...
--- drivers/scsi/fcoe/fcoe.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/fcoe/fcoe.c +1 -0
@@ -2506,6 +2506,7 @@ static int __init fcoe_init(void) out_free:mutex_unlock (&fcoe_config_mutex); +fcoe_transport_detach (&fcoe_sw_transport); out_destroy:destroy_workqueue (fcoe_wq);return rc;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 264/658 scsi: snic: Fix possible UAF in snic_tgt_create()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit e118df492320176af94deec000ae034cc92be754 ]
Smatch reports a warning as follows:
drivers/scsi/snic/snic_disc.c:307 snic_tgt_create() warn:
'&tgt->list' not removed from list
If device_add() fails in snic_tgt_create(), tgt will be freed, but tgt->list will not be removed from snic->disc.tgt_list, then list traversal may cause UAF.
Remove from snic->disc.tgt_list before free().
--- drivers/scsi/snic/snic_disc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/snic/snic_disc.c +3 -0
@@ -318,6 +318,9 @@ snic_tgt_create(struct snic *snic, struct snic_tgt_id *tgtid) ret);put_device (&snic->shost->shost_gendev); +spin_lock_irqsave (snic->shost->host_lock, flags); +list_del (&tgt->list); +spin_unlock_irqrestore (snic->shost->host_lock, flags);kfree (tgt); tgt =NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 265/658 RDMA/nldev: Add checks for nla_nest_start() in fill_stat_counter_qps()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit ea5ef136e215fdef35f14010bc51fcd6686e6922 ]
As the nla_nest_start() may fail with NULL returned, the return value needs to be checked.
--- drivers/infiniband/core/nldev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/core/nldev.c +2 -0
@@ -694,6 +694,8 @@ static int fill_stat_counter_qps(struct sk_buff *msg,int ret =0 ; table_attr =nla_nest_start (msg,RDMA_NLDEV_ATTR_RES_QP ); +if (!table_attr) +return -EMSGSIZE ; rt = &counter->device->res[RDMA_RESTRACK_QP ];xa_lock (&rt->xa);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 266/658 f2fs: avoid victim selection from previous victim section
In reply to Greg Kroah-HartmanFrom: Yonggil Song <[email protected]>
[ Upstream commit e219aecfd4b766c4e878a3769057e9809f7fcadc ]
When f2fs chooses GC victim in large section & LFS mode, next_victim_seg[gc_type] is referenced first. After segment is freed, next_victim_seg[gc_type] has the next segment number.
However, next_victim_seg[gc_type] still has the last segment number even after the last segment of section is freed. In this case, when f2fs chooses a victim for the next GC round, the last segment of previous victim section is chosen as a victim.
Initialize next_victim_seg[gc_type] to NULL_SEGNO for the last segment in large section.
--- fs/f2fs/gc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/f2fs/gc.c +3 -2
@@ -1253,8 +1253,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, seg_freed++; migrated++; -if (__is_large_section (sbi) && segno +1 < end_segno) - sbi->next_victim_seg[gc_type] = segno +1 ; +if (__is_large_section (sbi)) + sbi->next_victim_seg[gc_type] = + (segno +1 < end_segno) ? segno +1 :NULL_SEGNO ; skip:f2fs_put_page (sum_page,0 ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 267/658 crypto: omap-sham - Use pm_runtime_resume_and_get() in omap_sham_probe()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit 7bcceb4c9896b1b672b636ae70fe75110d6bf1ad ]
omap_sham_probe() calls pm_runtime_get_sync() and calls pm_runtime_put_sync() latter to put usage_counter. However, pm_runtime_get_sync() will increment usage_counter even it failed. Fix it by replacing it with pm_runtime_resume_and_get() to keep usage counter balanced.
--- drivers/crypto/omap-sham.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/omap-sham.c +1 -1
@@ -2141,7 +2141,7 @@ static int omap_sham_probe(struct platform_device *pdev)pm_runtime_enable (dev);pm_runtime_irq_safe (dev); - err =pm_runtime_get_sync (dev); + err =pm_runtime_resume_and_get (dev);if (err <0 ) {dev_err (dev,"failed to get sync: %d\n" , err); goto err_pm;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 268/658 RDMA/hfi1: Fix error return code in parse_platform_config()
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit 725349f8ba1e78a146c6ff8f3ee5e2712e517106 ]
In the previous iteration of the while loop, the "ret" may have been assigned a value of 0, so the error return code -EINVAL may have been incorrectly set to 0. To fix set valid return code before calling to goto.
--- drivers/infiniband/hw/hfi1/firmware.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/infiniband/hw/hfi1/firmware.c +6 -0
@@ -1786,6 +1786,7 @@ int parse_platform_config(struct hfi1_devdata *dd)if (!dd->platform_config.data) {dd_dev_err (dd,"%s: Missing config file\n" , __func__); + ret = -EINVAL ; goto bail; } ptr = (u32 *)dd->platform_config.data;
@@ -1794,6 +1795,7 @@ int parse_platform_config(struct hfi1_devdata *dd) ptr++;if (magic_num !=PLATFORM_CONFIG_MAGIC_NUM ) {dd_dev_err (dd,"%s: Bad config file\n" , __func__); + ret = -EINVAL ; goto bail; }
@@ -1817,6 +1819,7 @@ int parse_platform_config(struct hfi1_devdata *dd)if (file_length > dd->platform_config.size) {dd_dev_info (dd,"%s:File claims to be larger than read size\n" , __func__); + ret = -EINVAL ; goto bail; }else if (file_length < dd->platform_config.size) { dd_dev_info(dd,
@@ -1837,6 +1840,7 @@ int parse_platform_config(struct hfi1_devdata *dd)dd_dev_err (dd,"%s: Failed validation at offset %ld\n" , __func__, (ptr - (u32 *) dd->platform_config.data)); + ret = -EINVAL ; goto bail; }
@@ -1883,6 +1887,7 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *) dd->platform_config.data)); + ret = -EINVAL ; goto bail;/* We don't trust this file now */ } pcfgcache->config_tables[table_type].table = ptr;
@@ -1907,6 +1912,7 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *)dd->platform_config.data)); + ret = -EINVAL ; goto bail;/* We don't trust this file now */ } pcfgcache->config_tables[table_type].table_metadata =
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 269/658 orangefs: Fix sysfs not cleanup when dev init failed
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit ea60a4ad0cf88b411cde6888b8c890935686ecd7 ]
When the dev init failed, should cleanup the sysfs, otherwise, the module will never be loaded since can not create duplicate sysfs directory:
sysfs: cannot create duplicate filename '/fs/orangefs'
CPU: 1 PID: 6549 Comm: insmod Tainted: G W 6.0.0+ #44 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-1.fc33 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x34/0x44 sysfs_warn_dup.cold+0x17/0x24 sysfs_create_dir_ns+0x16d/0x180 kobject_add_internal+0x156/0x3a0 kobject_init_and_add+0xcf/0x120 orangefs_sysfs_init+0x7e/0x3a0 [orangefs] orangefs_init+0xfe/0x1000 [orangefs] do_one_initcall+0x87/0x2a0 do_init_module+0xdf/0x320 load_module+0x2f98/0x3330 __do_sys_finit_module+0x113/0x1b0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
kobject_add_internal failed for orangefs with -EEXIST, don't try to register things with the same name in the same directory.
--- fs/orangefs/orangefs-mod.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/orangefs/orangefs-mod.c +4 -4
@@ -141,7 +141,7 @@ static int __init orangefs_init(void)gossip_err ("%s: could not initialize device subsystem %d!\n" , __func__, ret); - goto cleanup_device; + goto cleanup_sysfs; } ret =register_filesystem (&orangefs_fs_type);
@@ -153,11 +153,11 @@ static int __init orangefs_init(void) goto out; } -orangefs_sysfs_exit (); - -cleanup_device:orangefs_dev_cleanup (); +cleanup_sysfs: +orangefs_sysfs_exit (); + sysfs_init_failed:orangefs_debugfs_cleanup ();
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 270/658 crypto: img-hash - Fix variable dereferenced before check hdev->req
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 04ba54e5af8f8f0137b08cb51a0b3a2e1ea46c94 ]
Smatch report warning as follows:
drivers/crypto/img-hash.c:366 img_hash_dma_task() warn: variable dereferenced before check 'hdev->req'
Variable dereferenced should be done after check 'hdev->req', fix it.
--- drivers/crypto/img-hash.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/crypto/img-hash.c +6 -2
@@ -356,12 +356,16 @@ static int img_hash_dma_init(struct img_hash_dev *hdev)static void img_hash_dma_task (unsigned long d) {struct img_hash_dev *hdev = (struct img_hash_dev *)d; -struct img_hash_request_ctx *ctx =ahash_request_ctx (hdev->req); +struct img_hash_request_ctx *ctx;u8 *addr;size_t nbytes, bleft, wsend, len, tbc;struct scatterlist tsg; -if (!hdev->req || !ctx->sg) +if (!hdev->req) +return ; + + ctx =ahash_request_ctx (hdev->req); +if (!ctx->sg)return ; addr =sg_virt (ctx->sg);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 271/658 hwrng: amd - Fix PCI device refcount leak
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit ecadb5b0111ea19fc7c240bb25d424a94471eb7d ]
for_each_pci_dev() is implemented by pci_get_device(). The comment of pci_get_device() says that it will increase the reference count for the returned pci_dev and also decrease the reference count for the input pci_dev @from if it is not NULL.
If we break for_each_pci_dev() loop with pdev not NULL, we need to call pci_dev_put() to decrease the reference count. Add the missing pci_dev_put() for the normal and error path.
--- drivers/char/hw_random/amd-rng.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/char/hw_random/amd-rng.c +13 -5
@@ -143,15 +143,19 @@ static int __init mod_init(void) found: err =pci_read_config_dword (pdev,0x58 , &pmbase);if (err) -return err; + goto put_dev; pmbase &=0x0000FF00 ; -if (pmbase ==0 ) -return -EIO ; +if (pmbase ==0 ) { + err = -EIO ; + goto put_dev; + } priv =kzalloc (sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; +if (!priv) { + err = -ENOMEM ; + goto put_dev; + }if (!request_region (pmbase +PMBASE_OFFSET ,PMBASE_SIZE ,DRV_NAME )) { dev_err(&pdev->dev, DRV_NAME " region 0x%x already in use!\n",
@@ -185,6 +189,8 @@ static int __init mod_init(void)release_region (pmbase +PMBASE_OFFSET ,PMBASE_SIZE ); out:kfree (priv); +put_dev: +pci_dev_put (pdev);return err; }
@@ -200,6 +206,8 @@ static void __exit mod_exit(void)release_region (priv->pmbase +PMBASE_OFFSET ,PMBASE_SIZE ); +pci_dev_put (priv->pcidev); +kfree (priv); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 272/658 hwrng: geode - Fix PCI device refcount leak
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit 9f6ec8dc574efb7f4f3d7ee9cd59ae307e78f445 ]
for_each_pci_dev() is implemented by pci_get_device(). The comment of pci_get_device() says that it will increase the reference count for the returned pci_dev and also decrease the reference count for the input pci_dev @from if it is not NULL.
If we break for_each_pci_dev() loop with pdev not NULL, we need to call pci_dev_put() to decrease the reference count. We add a new struct 'amd_geode_priv' to record pointer of the pci_dev and membase, and then add missing pci_dev_put() for the normal and error path.
--- drivers/char/hw_random/geode-rng.c | 36 +++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-)
drivers/char/hw_random/geode-rng.c +28 -8
@@ -51,6 +51,10 @@ static const struct pci_device_id pci_tbl[] = { };MODULE_DEVICE_TABLE (pci, pci_tbl); +struct amd_geode_priv { +struct pci_dev *pcidev; +void __iomem *membase; +};static int geode_rng_data_read (struct hwrng *rng,u32 *data) {
@@ -90,6 +94,7 @@ static int __init mod_init(void)const struct pci_device_id *ent;void __iomem *mem;unsigned long rng_base; +struct amd_geode_priv *priv;for_each_pci_dev (pdev) { ent =pci_match_id (pci_tbl, pdev);
@@ -97,17 +102,26 @@ static int __init mod_init(void) goto found; }/* Device not found. */ - goto out; +return err; found: + priv =kzalloc (sizeof (*priv),GFP_KERNEL ); +if (!priv) { + err = -ENOMEM ; + goto put_dev; + } + rng_base =pci_resource_start (pdev,0 );if (rng_base ==0 ) - goto out; + goto free_priv; err = -ENOMEM ; mem =ioremap (rng_base,0x58 );if (!mem) - goto out; - geode_rng.priv = (unsigned long )mem; + goto free_priv; + + geode_rng.priv = (unsigned long )priv; + priv->membase = mem; + priv->pcidev = pdev;pr_info ("AMD Geode RNG detected\n" ); err =hwrng_register (&geode_rng);
@@ -116,20 +130,26 @@ static int __init mod_init(void) err); goto err_unmap; } -out:return err; err_unmap:iounmap (mem); - goto out; +free_priv: +kfree (priv); +put_dev: +pci_dev_put (pdev); +return err; } static void __exit mod_exit(void) { -void __iomem *mem = (void __iomem *)geode_rng.priv; +struct amd_geode_priv *priv; + priv = (struct amd_geode_priv *)geode_rng.priv;hwrng_unregister (&geode_rng); -iounmap (mem); +iounmap (priv->membase); +pci_dev_put (priv->pcidev); +kfree (priv); }module_init (mod_init);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 273/658 IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces
In reply to Greg Kroah-HartmanFrom: Dragos Tatulea <[email protected]>
[ Upstream commit dbc94a0fb81771a38733c0e8f2ea8c4fa6934dc1 ]
There are 2 ways to create IPoIB PKEY child interfaces:
1) Writing a PKEY to /sys/class/net/<ib parent interface>/create_child.
2) Using netlink with iproute.
While with sysfs the child interface has the same number of tx and rx queues as the parent, with netlink there will always be 1 tx and 1 rx queue for the child interface. That's because the get_num_tx/rx_queues() netlink ops are missing and the default value of 1 is taken for the number of queues (in rtnl_create_link()).
This change adds the get_num_tx/rx_queues() ops which allows for interfaces with multiple queues to be created over netlink. This constant only represents the max number of tx and rx queues on that net device.
--- drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/infiniband/ulp/ipoib/ipoib_netlink.c +7 -0
@@ -42,6 +42,11 @@ static const struct nla_policy ipoib_policy[IFLA_IPOIB_MAX + 1] = { [IFLA_IPOIB_UMCAST] = { .type = NLA_U16 }, }; +static unsigned int ipoib_get_max_num_queues (void ) +{ + return min_t(unsigned int, num_possible_cpus(), 128); +} +static int ipoib_fill_info (struct sk_buff *skb,const struct net_device *dev) {struct ipoib_dev_priv *priv =ipoib_priv (dev);
@@ -173,6 +178,8 @@ static struct rtnl_link_ops ipoib_link_ops __read_mostly = { .changelink = ipoib_changelink, .get_size = ipoib_get_size, .fill_info = ipoib_fill_info, + .get_num_rx_queues = ipoib_get_max_num_queues, + .get_num_tx_queues = ipoib_get_max_num_queues, };struct rtnl_link_ops *ipoib_get_link_ops (void )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 274/658 drivers: dio: fix possible memory leak in dio_init()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e63e99397b2613d50a5f4f02ed07307e67a190f1 ]
If device_register() returns error, the 'dev' and name needs be freed. Add a release function, and then call put_device() in the error path, so the name is freed in kobject_cleanup() and to the 'dev' is freed in release function.
--- drivers/dio/dio.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/dio/dio.c +8 -0
@@ -110,6 +110,12 @@ static char dio_no_name[] = { 0 };#endif /* CONFIG_DIO_CONSTANTS */ +static void dio_dev_release (struct device *dev) +{ + struct dio_dev *ddev = container_of(dev, typeof(struct dio_dev), dev); +kfree (ddev); +} +int __init dio_find (int deviceid) {/* Called to find a DIO device before the full bus scan has run.
@@ -222,6 +228,7 @@ static int __init dio_init(void) dev->bus = &dio_bus; dev->dev.parent = &dio_bus.dev; dev->dev.bus = &dio_bus_type; + dev->dev.release = dio_dev_release; dev->scode = scode; dev->resource.start = pa; dev->resource.end = pa +DIO_SIZE (scode, va);
@@ -249,6 +256,7 @@ static int __init dio_init(void)if (error) {pr_err ("DIO: Error registering device %s\n" , dev->name); +put_device (&dev->dev);continue ; } error =dio_create_sysfs_dev_files (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 275/658 tty: serial: tegra: Activate RX DMA transfer by request
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit d5e3fadb70125c6c41f692cf1c0e626c12e11de1 ]
This allows DMA engine to go into runtime-suspended mode whenever there is no data to receive, instead of keeping DMA active all the time while TTY is opened (i.e. permanently active in practice, like in the case of UART Bluetooth).
Stable-dep-of: 109a951a9f1f ("serial: tegra: Read DMA status before terminating")
--- drivers/tty/serial/serial-tegra.c | 78 ++++++++++++++++++------------- 1 file changed, 46 insertions(+), 32 deletions(-)
drivers/tty/serial/serial-tegra.c +46 -32
@@ -141,6 +141,7 @@ struct tegra_uart_port {int configured_rate;bool use_rx_pio;bool use_tx_pio; +bool rx_dma_active; };static void tegra_uart_start_next_tx (struct tegra_uart_port *tup);
@@ -733,6 +734,7 @@ static void tegra_uart_rx_dma_complete(void *args)if (tup->rts_active)set_rts (tup, false); + tup->rx_dma_active = false;tegra_uart_rx_buffer_push (tup,0 );tegra_uart_start_rx_dma (tup);
@@ -744,18 +746,27 @@ static void tegra_uart_rx_dma_complete(void *args)spin_unlock_irqrestore (&u->lock, flags); } -static void tegra_uart_handle_rx_dma (struct tegra_uart_port *tup) +static void tegra_uart_terminate_rx_dma (struct tegra_uart_port *tup) {struct dma_tx_state state; -/* Deactivate flow control to stop sender */ -if (tup->rts_active) -set_rts (tup, false); +if (!tup->rx_dma_active) +return ;dmaengine_terminate_all (tup->rx_dma_chan);dmaengine_tx_status (tup->rx_dma_chan, tup->rx_cookie, &state); +tegra_uart_rx_buffer_push (tup, state.residue); -tegra_uart_start_rx_dma (tup); + tup->rx_dma_active = false; +} + +static void tegra_uart_handle_rx_dma (struct tegra_uart_port *tup) +{ +/* Deactivate flow control to stop sender */ +if (tup->rts_active) +set_rts (tup, false); + +tegra_uart_terminate_rx_dma (tup);if (tup->rts_active)set_rts (tup, true);
@@ -765,6 +776,9 @@ static int tegra_uart_start_rx_dma(struct tegra_uart_port *tup) {unsigned int count =TEGRA_UART_RX_DMA_BUFFER_SIZE ; +if (tup->rx_dma_active) +return 0 ; + tup->rx_dma_desc =dmaengine_prep_slave_single (tup->rx_dma_chan, tup->rx_dma_buf_phys, count,DMA_DEV_TO_MEM ,DMA_PREP_INTERRUPT );
@@ -773,6 +787,7 @@ static int tegra_uart_start_rx_dma(struct tegra_uart_port *tup)return -EIO ; } + tup->rx_dma_active = true; tup->rx_dma_desc->callback = tegra_uart_rx_dma_complete; tup->rx_dma_desc->callback_param = tup; dma_sync_single_for_device(tup->uport.dev, tup->rx_dma_buf_phys,
@@ -822,6 +837,7 @@ static irqreturn_t tegra_uart_isr(int irq, void *data)struct uart_port *u = &tup->uport;unsigned long iir;unsigned long ier; +bool is_rx_start = false;bool is_rx_int = false;unsigned long flags;
@@ -834,10 +850,12 @@ static irqreturn_t tegra_uart_isr(int irq, void *data)if (tup->rx_in_progress) { ier = tup->ier_shadow; ier |= (UART_IER_RLSI |UART_IER_RTOIE | -TEGRA_UART_IER_EORD ); +TEGRA_UART_IER_EORD |UART_IER_RDI ); tup->ier_shadow = ier;tegra_uart_write (tup, ier,UART_IER ); } + }else if (is_rx_start) { +tegra_uart_start_rx_dma (tup); }spin_unlock_irqrestore (&u->lock, flags);return IRQ_HANDLED ;
@@ -856,17 +874,23 @@ static irqreturn_t tegra_uart_isr(int irq, void *data)case 4 :/* End of data */ case 6 :/* Rx timeout */ -case 2 :/* Receive */ -if (!tup->use_rx_pio && !is_rx_int) { - is_rx_int = true; +if (!tup->use_rx_pio) { + is_rx_int = tup->rx_in_progress;/* Disable Rx interrupts */ ier = tup->ier_shadow; - ier |=UART_IER_RDI ; -tegra_uart_write (tup, ier,UART_IER ); ier &= ~(UART_IER_RDI |UART_IER_RLSI |UART_IER_RTOIE |TEGRA_UART_IER_EORD ); tup->ier_shadow = ier;tegra_uart_write (tup, ier,UART_IER ); +break ; + } +/* Fall through */ +case 2 :/* Receive */ +if (!tup->use_rx_pio) { + is_rx_start = tup->rx_in_progress; + tup->ier_shadow &= ~UART_IER_RDI ; +tegra_uart_write (tup, tup->ier_shadow, +UART_IER ); }else {do_handle_rx_pio (tup); }
@@ -888,7 +912,6 @@ static void tegra_uart_stop_rx(struct uart_port *u) {struct tegra_uart_port *tup =to_tegra_uport (u);struct tty_port *port = &tup->uport.state->port; -struct dma_tx_state state;unsigned long ier;if (tup->rts_active)
@@ -905,13 +928,11 @@ static void tegra_uart_stop_rx(struct uart_port *u) tup->ier_shadow = ier;tegra_uart_write (tup, ier,UART_IER ); tup->rx_in_progress =0 ; -if (tup->rx_dma_chan && !tup->use_rx_pio) { -dmaengine_terminate_all (tup->rx_dma_chan); -dmaengine_tx_status (tup->rx_dma_chan, tup->rx_cookie, &state); -tegra_uart_rx_buffer_push (tup, state.residue); - }else { + +if (!tup->use_rx_pio) +tegra_uart_terminate_rx_dma (tup); +else tegra_uart_handle_rx_pio (tup, port); - } }static void tegra_uart_hw_deinit (struct tegra_uart_port *tup)
@@ -1056,12 +1077,6 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup) tup->lcr_shadow =TEGRA_UART_DEFAULT_LSR ; tup->fcr_shadow |=UART_FCR_DMA_SELECT ;tegra_uart_write (tup, tup->fcr_shadow,UART_FCR ); - - ret =tegra_uart_start_rx_dma (tup); -if (ret <0 ) { -dev_err (tup->uport.dev,"Not able to start Rx DMA\n" ); -return ret; - } }else {tegra_uart_write (tup, tup->fcr_shadow,UART_FCR ); }
@@ -1071,10 +1086,6 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup)* Enable IE_RXS for the receive status interrupts like line errros. * Enable IE_RX_TIMEOUT to get the bytes which cannot be DMA'd. * -* If using DMA mode, enable EORD instead of receive interrupt which -* will interrupt after the UART is done with the receive instead of -* the interrupt when the FIFO "threshold" is reached. -* * EORD is different interrupt than RX_TIMEOUT - RX_TIMEOUT occurs when * the DATA is sitting in the FIFO and couldn't be transferred to the * DMA as the DMA size alignment (4 bytes) is not met. EORD will be
@@ -1085,11 +1096,14 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup)* both the EORD as well as RX_TIMEOUT - SW sees RX_TIMEOUT first * then the EORD. */ + tup->ier_shadow =UART_IER_RLSI |UART_IER_RTOIE |UART_IER_RDI ; + +/* +* If using DMA mode, enable EORD interrupt to notify about RX +* completion. +*/ if (!tup->use_rx_pio) - tup->ier_shadow =UART_IER_RLSI |UART_IER_RTOIE | -TEGRA_UART_IER_EORD ; -else - tup->ier_shadow =UART_IER_RLSI |UART_IER_RTOIE |UART_IER_RDI ; + tup->ier_shadow |=TEGRA_UART_IER_EORD ;tegra_uart_write (tup, tup->ier_shadow,UART_IER );return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 276/658 serial: tegra: Read DMA status before terminating
In reply to Greg Kroah-HartmanFrom: Kartik <[email protected]>
[ Upstream commit 109a951a9f1fd8a34ebd1896cbbd5d5cede880a7 ]
Read the DMA status before terminating the DMA, as doing so deletes the DMA desc.
Also, to get the correct transfer status information, pause the DMA using dmaengine_pause() before reading the DMA status.
--- drivers/tty/serial/serial-tegra.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/serial/serial-tegra.c +4 -2
@@ -613,8 +613,9 @@ static void tegra_uart_stop_tx(struct uart_port *u)if (tup->tx_in_progress !=TEGRA_UART_TX_DMA )return ; -dmaengine_terminate_all (tup->tx_dma_chan); +dmaengine_pause (tup->tx_dma_chan);dmaengine_tx_status (tup->tx_dma_chan, tup->tx_cookie, &state); +dmaengine_terminate_all (tup->tx_dma_chan); count = tup->tx_bytes_requested - state.residue;async_tx_ack (tup->tx_dma_desc);uart_xmit_advance (&tup->uport, count);
@@ -753,8 +754,9 @@ static void tegra_uart_terminate_rx_dma(struct tegra_uart_port *tup)if (!tup->rx_dma_active)return ; -dmaengine_terminate_all (tup->rx_dma_chan); +dmaengine_pause (tup->rx_dma_chan);dmaengine_tx_status (tup->rx_dma_chan, tup->rx_cookie, &state); +dmaengine_terminate_all (tup->rx_dma_chan);tegra_uart_rx_buffer_push (tup, state.residue); tup->rx_dma_active = false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 277/658 class: fix possible memory leak in __class_register()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 8c3e8a6bdb5253b97ad532570f8b5db5f7a06407 ]
If class_add_groups() returns error, the 'cp->subsys' need be unregister, and the 'cp' need be freed.
We can not call kset_unregister() here, because the 'cls' will be freed in callback function class_release() and it's also freed in caller's error path, it will cause double free.
So fix this by calling kobject_del() and kfree_const(name) to cleanup kobject. Besides, call kfree() to free the 'cp'.
Fault injection test can trigger this:
unreferenced object 0xffff888102fa8190 (size 8):
comm "modprobe", pid 502, jiffies 4294906074 (age 49.296s) hex dump (first 8 bytes):
70 6b 74 63 64 76 64 00 pktcdvd.
backtrace:
[<00000000e7c7703d>] __kmalloc_track_caller+0x1ae/0x320
[<000000005e4d70bc>] kstrdup+0x3a/0x70
[<00000000c2e5e85a>] kstrdup_const+0x68/0x80
[<000000000049a8c7>] kvasprintf_const+0x10b/0x190
[<0000000029123163>] kobject_set_name_vargs+0x56/0x150
[<00000000747219c9>] kobject_set_name+0xab/0xe0
[<0000000005f1ea4e>] __class_register+0x15c/0x49aunreferenced object 0xffff888037274000 (size 1024):
comm "modprobe", pid 502, jiffies 4294906074 (age 49.296s) hex dump (first 32 bytes):
00 40 27 37 80 88 ff ff 00 40 27 37 80 88 ff ff .@'7.....@'7....
00 00 00 00 ad 4e ad de ff ff ff ff 00 00 00 00 .....N..........
backtrace:
[<00000000151f9600>] kmem_cache_alloc_trace+0x17c/0x2f0
[<00000000ecf3dd95>] __class_register+0x86/0x49a--- drivers/base/class.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/base/class.c +5 -0
@@ -191,6 +191,11 @@ int __class_register(struct class *cls, struct lock_class_key *key) } error =class_add_groups (class_get (cls), cls->class_groups);class_put (cls); +if (error) { +kobject_del (&cp->subsys.kobj); +kfree_const (cp->subsys.kobj.name); +kfree (cp); + }return error; }EXPORT_SYMBOL_GPL (__class_register);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 278/658 vfio: platform: Do not pass return buffer to ACPI _RST method
In reply to Greg Kroah-HartmanFrom: Rafael Mendonca <[email protected]>
[ Upstream commit e67e070632a665c932d534b8b800477bb3111449 ]
The ACPI _RST method has no return value, there's no need to pass a return buffer to acpi_evaluate_object().
--- drivers/vfio/platform/vfio_platform_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/vfio/platform/vfio_platform_common.c +1 -2
@@ -72,12 +72,11 @@ static int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev, const char **extra_dbg) {#ifdef CONFIG_ACPI -struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };struct device *dev = vdev->device;acpi_handle handle =ACPI_HANDLE (dev);acpi_status acpi_ret; - acpi_ret =acpi_evaluate_object (handle,"_RST" ,NULL , &buffer); + acpi_ret =acpi_evaluate_object (handle,"_RST" ,NULL ,NULL );if (ACPI_FAILURE (acpi_ret)) {if (extra_dbg) *extra_dbg =acpi_format_exception (acpi_ret);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 279/658 uio: uio_dmem_genirq: Fix missing unlock in irq configuration
In reply to Greg Kroah-HartmanFrom: Rafael Mendonca <[email protected]>
[ Upstream commit 9de255c461d1b3f0242b3ad1450c3323a3e00b34 ]
Commit b74351287d4b ("uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol()") started calling disable_irq() without holding the spinlock because it can sleep. However, that fix introduced another bug: if interrupt is already disabled and a new disable request comes in, then the spinlock is not unlocked:
root@localhost:~# printf '\x00\x00\x00\x00' > /dev/uio0 root@localhost:~# printf '\x00\x00\x00\x00' > /dev/uio0 root@localhost:~# [ 14.851538] BUG: scheduling while atomic: bash/223/0x00000002 [ 14.851991] Modules linked in: uio_dmem_genirq uio myfpga(OE) bochs drm_vram_helper drm_ttm_helper ttm drm_kms_helper drm snd_pcm ppdev joydev psmouse snd_timer snd e1000fb_sys_fops syscopyarea parport sysfillrect soundcore sysimgblt input_leds pcspkr i2c_piix4 serio_raw floppy evbug qemu_fw_cfg mac_hid pata_acpi ip_tables x_tables autofs4 [last unloaded: parport_pc] [ 14.854206] CPU: 0 PID: 223 Comm: bash Tainted: G OE 6.0.0-rc7 #21 [ 14.854786] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 [ 14.855664] Call Trace: [ 14.855861] <TASK> [ 14.856025] dump_stack_lvl+0x4d/0x67 [ 14.856325] dump_stack+0x14/0x1a [ 14.856583] __schedule_bug.cold+0x4b/0x5c [ 14.856915] __schedule+0xe81/0x13d0 [ 14.857199] ? idr_find+0x13/0x20 [ 14.857456] ? get_work_pool+0x2d/0x50 [ 14.857756] ? __flush_work+0x233/0x280 [ 14.858068] ? __schedule+0xa95/0x13d0 [ 14.858307] ? idr_find+0x13/0x20 [ 14.858519] ? get_work_pool+0x2d/0x50 [ 14.858798] schedule+0x6c/0x100 [ 14.859009] schedule_hrtimeout_range_clock+0xff/0x110 [ 14.859335] ? tty_write_room+0x1f/0x30 [ 14.859598] ? n_tty_poll+0x1ec/0x220 [ 14.859830] ? tty_ldisc_deref+0x1a/0x20 [ 14.860090] schedule_hrtimeout_range+0x17/0x20 [ 14.860373] do_select+0x596/0x840 [ 14.860627] ? __kernel_text_address+0x16/0x50 [ 14.860954] ? poll_freewait+0xb0/0xb0 [ 14.861235] ? poll_freewait+0xb0/0xb0 [ 14.861517] ? rpm_resume+0x49d/0x780 [ 14.861798] ? common_interrupt+0x59/0xa0 [ 14.862127] ? asm_common_interrupt+0x2b/0x40 [ 14.862511] ? __uart_start.isra.0+0x61/0x70 [ 14.862902] ? __check_object_size+0x61/0x280 [ 14.863255] core_sys_select+0x1c6/0x400 [ 14.863575] ? vfs_write+0x1c9/0x3d0 [ 14.863853] ? vfs_write+0x1c9/0x3d0 [ 14.864121] ? _copy_from_user+0x45/0x70 [ 14.864526] do_pselect.constprop.0+0xb3/0xf0 [ 14.864893] ? do_syscall_64+0x6d/0x90 [ 14.865228] ? do_syscall_64+0x6d/0x90 [ 14.865556] __x64_sys_pselect6+0x76/0xa0 [ 14.865906] do_syscall_64+0x60/0x90 [ 14.866214] ? syscall_exit_to_user_mode+0x2a/0x50 [ 14.866640] ? do_syscall_64+0x6d/0x90 [ 14.866972] ? do_syscall_64+0x6d/0x90 [ 14.867286] ? do_syscall_64+0x6d/0x90 [ 14.867626] entry_SYSCALL_64_after_hwframe+0x63/0xcd [...] stripped [ 14.872959] </TASK>
('myfpga' is a simple 'uio_dmem_genirq' driver I wrote to test this)
The implementation of "uio_dmem_genirq" was based on "uio_pdrv_genirq" and it is used in a similar manner to the "uio_pdrv_genirq" driver with respect to interrupt configuration and handling. At the time "uio_dmem_genirq" was introduced, both had the same implementation of the 'uio_info' handlers irqcontrol() and handler(). Then commit 34cb27528398 ("UIO: Fix concurrency issue"), which was only applied to "uio_pdrv_genirq", ended up making them a little different. That commit, among other things, changed disable_irq() to disable_irq_nosync() in the implementation of irqcontrol(). The motivation there was to avoid a deadlock between irqcontrol() and handler(), since it added a spinlock in the irq handler, and disable_irq() waits for the completion of the irq handler.
By changing disable_irq() to disable_irq_nosync() in irqcontrol(), we also avoid the sleeping-while-atomic bug that commit b74351287d4b ("uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol()") was trying to fix. Thus, this fixes the missing unlock in irqcontrol() by importing the implementation of irqcontrol() handler from the "uio_pdrv_genirq" driver. In the end, it reverts commit b74351287d4b ("uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol()") and change disable_irq() to disable_irq_nosync().
It is worth noting that this still does not address the concurrency issue fixed by commit 34cb27528398 ("UIO: Fix concurrency issue"). It will be addressed separately in the next commits.
Split out from commit 34cb27528398 ("UIO: Fix concurrency issue").
--- drivers/uio/uio_dmem_genirq.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/uio/uio_dmem_genirq.c +3 -5
@@ -132,13 +132,11 @@ static int uio_dmem_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on)if (irq_on) {if (test_and_clear_bit (0 , &priv->flags))enable_irq (dev_info->irq); -spin_unlock_irqrestore (&priv->lock, flags); }else { -if (!test_and_set_bit (0 , &priv->flags)) { -spin_unlock_irqrestore (&priv->lock, flags); -disable_irq (dev_info->irq); - } +if (!test_and_set_bit (0 , &priv->flags)) +disable_irq_nosync (dev_info->irq); } +spin_unlock_irqrestore (&priv->lock, flags);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 280/658 uio: uio_dmem_genirq: Fix deadlock between irq config and handling
In reply to Greg Kroah-HartmanFrom: Rafael Mendonca <[email protected]>
[ Upstream commit 118b918018175d9fcd8db667f905012e986cc2c9 ]
This fixes a concurrency issue addressed in commit 34cb27528398 ("UIO: Fix concurrency issue"):
"In a SMP case there was a race condition issue between Uio_pdrv_genirq_irqcontrol() running on one CPU and irq handler on another CPU. Fix it by spin_locking shared resources access inside irq handler."
The implementation of "uio_dmem_genirq" was based on "uio_pdrv_genirq" and it is used in a similar manner to the "uio_pdrv_genirq" driver with respect to interrupt configuration and handling. At the time "uio_dmem_genirq" was merged, both had the same implementation of the 'uio_info' handlers irqcontrol() and handler(), thus, both had the same concurrency issue mentioned by the above commit. However, the above patch was only applied to the "uio_pdrv_genirq" driver.
Split out from commit 34cb27528398 ("UIO: Fix concurrency issue").
--- drivers/uio/uio_dmem_genirq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/uio/uio_dmem_genirq.c +4 -1
@@ -110,8 +110,10 @@ static irqreturn_t uio_dmem_genirq_handler(int irq, struct uio_info *dev_info)* remember the state so we can allow user space to enable it later. */ +spin_lock (&priv->lock);if (!test_and_set_bit (0 , &priv->flags))disable_irq_nosync (irq); +spin_unlock (&priv->lock);return IRQ_HANDLED ; }
@@ -125,7 +127,8 @@ static int uio_dmem_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on)* in the interrupt controller, but keep track of the * state to prevent per-irq depth damage. * -* Serialize this operation to support multiple tasks. +* Serialize this operation to support multiple tasks and concurrency +* with irq handler on SMP systems. */ spin_lock_irqsave (&priv->lock, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 281/658 usb: fotg210-udc: Fix ages old endianness issues
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 46ed6026ca2181c917c8334a82e3eaf40a6234dd ]
The code in the FOTG210 driver isn't entirely endianness-agnostic as reported by the kernel robot sparse testing. This came to the surface while moving the files around.
The driver is only used on little-endian systems, so this causes no real-world regression, but it is nice to be strict and have some compile coverage also on big endian machines, so fix it up with the right LE accessors.
--- drivers/usb/gadget/udc/fotg210-udc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/usb/gadget/udc/fotg210-udc.c +6 -6
@@ -629,10 +629,10 @@ static void fotg210_request_error(struct fotg210_udc *fotg210)static void fotg210_set_address (struct fotg210_udc *fotg210,struct usb_ctrlrequest *ctrl) { -if (ctrl->wValue >=0x0100 ) { +if (le16_to_cpu (ctrl->wValue) >=0x0100 ) {fotg210_request_error (fotg210); }else { -fotg210_set_dev_addr (fotg210, ctrl->wValue); +fotg210_set_dev_addr (fotg210,le16_to_cpu (ctrl->wValue));fotg210_set_cxdone (fotg210); } }
@@ -713,17 +713,17 @@ static void fotg210_get_status(struct fotg210_udc *fotg210,switch (ctrl->bRequestType &USB_RECIP_MASK ) {case USB_RECIP_DEVICE : - fotg210->ep0_data =1 <<USB_DEVICE_SELF_POWERED ; + fotg210->ep0_data =cpu_to_le16 (1 <<USB_DEVICE_SELF_POWERED );break ;case USB_RECIP_INTERFACE : - fotg210->ep0_data =0 ; + fotg210->ep0_data =cpu_to_le16 (0 );break ;case USB_RECIP_ENDPOINT : epnum = ctrl->wIndex &USB_ENDPOINT_NUMBER_MASK ;if (epnum) fotg210->ep0_data = -fotg210_is_epnstall (fotg210->ep[epnum]) - <<USB_ENDPOINT_HALT ; +cpu_to_le16 (fotg210_is_epnstall (fotg210->ep[epnum]) + <<USB_ENDPOINT_HALT );else fotg210_request_error (fotg210);break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 282/658 staging: vme_user: Fix possible UAF in tsi148_dma_list_add
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 357057ee55d3c99a5de5abe8150f7bca04f8e53b ]
Smatch report warning as follows:
drivers/staging/vme_user/vme_tsi148.c:1757 tsi148_dma_list_add() warn:
'&entry->list' not removed from list
In tsi148_dma_list_add(), the error path "goto err_dma" will not remove entry->list from list->entries, but entry will be freed, then list traversal may cause UAF.
Fix by removeing it from list->entries before free().
--- drivers/vme/bridges/vme_tsi148.c | 1 + 1 file changed, 1 insertion(+)
drivers/vme/bridges/vme_tsi148.c +1 -0
@@ -1771,6 +1771,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,return 0 ; err_dma: +list_del (&entry->list); err_dest: err_source: err_align:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 283/658 usb: typec: Check for ops->exit instead of ops->enter in altmode_exit
In reply to Greg Kroah-HartmanFrom: Sven Peter <[email protected]>
[ Upstream commit b6ddd180e3d9f92c1e482b3cdeec7dda086b1341 ]
typec_altmode_exit checks if ops->enter is not NULL but then calls ops->exit a few lines below. Fix that and check for the function pointer it's about to call instead.
--- drivers/usb/typec/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/bus.c +1 -1
@@ -126,7 +126,7 @@ int typec_altmode_exit(struct typec_altmode *adev)if (!adev || !adev->active)return 0 ; -if (!pdev->ops || !pdev->ops->enter) +if (!pdev->ops || !pdev->ops->exit)return -EOPNOTSUPP ;/* Moving to USB Safe State */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 284/658 usb: typec: tcpci: fix of node refcount leak in tcpci_register_port()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0384e87e3fec735e47f1c133c796f32ef7a72a9b ]
I got the following report while doing device(mt6370-tcpc) load test with CONFIG_OF_UNITTEST and CONFIG_OF_DYNAMIC enabled:
OF: ERROR: memory leak, expected refcount 1 instead of 2, of_node_get()/of_node_put() unbalanced - destroy cset entry:
attach overlay node /i2c/pmic@34/tcpc/connector
The 'fwnode' set in tcpci_parse_config() which is called in tcpci_register_port(), its node refcount is increased in device_get_named_child_node(). It needs be put while exiting, so call fwnode_handle_put() in the error path of tcpci_register_port() and in tcpci_unregister_port() to avoid leak.
--- drivers/usb/typec/tcpm/tcpci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/typec/tcpm/tcpci.c +4 -1
@@ -551,8 +551,10 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data)return ERR_PTR (err); tcpci->port =tcpm_register_port (tcpci->dev, &tcpci->tcpc); -if (IS_ERR (tcpci->port)) +if (IS_ERR (tcpci->port)) { +fwnode_handle_put (tcpci->tcpc.fwnode);return ERR_CAST (tcpci->port); + }return tcpci; }
@@ -561,6 +563,7 @@ EXPORT_SYMBOL_GPL(tcpci_register_port);void tcpci_unregister_port (struct tcpci *tcpci) {tcpm_unregister_port (tcpci->port); +fwnode_handle_put (tcpci->tcpc.fwnode); }EXPORT_SYMBOL_GPL (tcpci_unregister_port);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 285/658 serial: amba-pl011: avoid SBSA UART accessing DMACR register
In reply to Greg Kroah-HartmanFrom: Jiamei Xie <[email protected]>
[ Upstream commit 94cdb9f33698478b0e7062586633c42c6158a786 ]
Chapter "B Generic UART" in "ARM Server Base System Architecture" [1] documentation describes a generic UART interface. Such generic UART does not support DMA. In current code, sbsa_uart_pops and amba_pl011_pops share the same stop_rx operation, which will invoke pl011_dma_rx_stop, leading to an access of the DMACR register. This commit adds a using_rx_dma check in pl011_dma_rx_stop to avoid the access to DMACR register for SBSA UARTs which does not support DMA.
When the kernel enables DMA engine with "CONFIG_DMA_ENGINE=y", Linux
SBSA PL011 driver will access PL011 DMACR register in some functions.
For most real SBSA Pl011 hardware implementations, the DMACR write
behaviour will be ignored. So these DMACR operations will not cause
obvious problems. But for some virtual SBSA PL011 hardware, like Xen
virtual SBSA PL011 (vpl011) device, the behaviour might be different.
Xen vpl011 emulation will inject a data abort to guest, when guest is
accessing an unimplemented UART register. As Xen VPL011 is SBSA
compatible, it will not implement DMACR register. So when Linux SBSA
PL011 driver access DMACR register, it will get an unhandled data abort
fault and the application will get a segmentation fault:
Unhandled fault at 0xffffffc00944d048
Mem abort info:
ESR = 0x96000000
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x00: ttbr address size fault
Data abort info:
ISV = 0, ISS = 0x00000000
CM = 0, WnR = 0
swapper pgtable: 4k pages, 39-bit VAs, pgdp=0000000020e2e000
[ffffffc00944d048] pgd=100000003ffff803, p4d=100000003ffff803, pud=100000003ffff803, pmd=100000003fffa803, pte=006800009c090f13
Internal error: ttbr address size fault: 96000000 [#1] PREEMPT SMP ... Call trace: pl011_stop_rx+0x70/0x80 tty_port_shutdown+0x7c/0xb4 tty_port_close+0x60/0xcc uart_close+0x34/0x8c tty_release+0x144/0x4c0 __fput+0x78/0x220 ____fput+0x1c/0x30 task_work_run+0x88/0xc0 do_notify_resume+0x8d0/0x123c el0_svc+0xa8/0xc0 el0t_64_sync_handler+0xa4/0x130 el0t_64_sync+0x1a0/0x1a4 Code: b9000083 b901f001 794038a0 8b000042 (b9000041) ---[ end trace 83dd93df15c3216f ]---
note: bootlogd[132] exited with preempt_count 1 /etc/rcS.d/S07bootlogd: line 47: 132 Segmentation fault start-stop-daemon
This has been discussed in the Xen community, and we think it should fix this in Linux. See [2] for more information.
[1] https://developer.arm.com/documentation/den0094/c/?lang=en
[2] https://lists.xenproject.org/archives/html/xen-devel/2022-11/msg00543.html
--- drivers/tty/serial/amba-pl011.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/amba-pl011.c +3 -0
@@ -1053,6 +1053,9 @@ static void pl011_dma_rx_callback(void *data)*/ static inline void pl011_dma_rx_stop (struct uart_amba_port *uap) { +if (!uap->using_rx_dma) +return ; +/* FIXME. Just disable the DMA enable */ uap->dmacr &= ~UART011_RXDMAE ;pl011_write (uap->dmacr, uap,REG_DMACR );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 286/658 serial: pl011: Do not clear RX FIFO & RX interrupt in unthrottle.
In reply to Greg Kroah-HartmanFrom: delisun <[email protected]>
[ Upstream commit 032d5a71ed378ffc6a2d41a187d8488a4f9fe415 ]
Clearing the RX FIFO will cause data loss.
Copy the pl011_enabl_interrupts implementation, and remove the clear interrupt and FIFO part of the code.
--- drivers/tty/serial/amba-pl011.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/tty/serial/amba-pl011.c +10 -1
@@ -1771,8 +1771,17 @@ static void pl011_enable_interrupts(struct uart_amba_port *uap)static void pl011_unthrottle_rx (struct uart_port *port) { struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port); +unsigned long flags; -pl011_enable_interrupts (uap); +spin_lock_irqsave (&uap->port.lock, flags); + + uap->im =UART011_RTIM ; +if (!pl011_dma_rx_running (uap)) + uap->im |=UART011_RXIM ; + +pl011_write (uap->im, uap,REG_IMSC ); + +spin_unlock_irqrestore (&uap->port.lock, flags); }static int pl011_startup (struct uart_port *port)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 287/658 serial: pch: Fix PCI device refcount leak in pch_request_dma()
In reply to Greg Kroah-HartmanFrom: Xiongfeng Wang <[email protected]>
[ Upstream commit 8be3a7bf773700534a6e8f87f6ed2ed111254be5 ]
As comment of pci_get_slot() says, it returns a pci_device with its refcount increased. The caller must decrement the reference count by calling pci_dev_put().
Since 'dma_dev' is only used to filter the channel in filter(), we can call pci_dev_put() before exiting from pch_request_dma(). Add the missing pci_dev_put() for the normal and error path.
--- drivers/tty/serial/pch_uart.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/pch_uart.c +4 -0
@@ -718,6 +718,7 @@ static void pch_request_dma(struct uart_port *port)if (!chan) {dev_err (priv->port.dev,"%s:dma_request_channel FAILS(Tx)\n" , __func__); +pci_dev_put (dma_dev);return ; } priv->chan_tx = chan;
@@ -734,6 +735,7 @@ static void pch_request_dma(struct uart_port *port) __func__);dma_release_channel (priv->chan_tx); priv->chan_tx =NULL ; +pci_dev_put (dma_dev);return ; }
@@ -741,6 +743,8 @@ static void pch_request_dma(struct uart_port *port) priv->rx_buf_virt =dma_alloc_coherent (port->dev, port->fifosize, &priv->rx_buf_dma,GFP_KERNEL ); priv->chan_rx = chan; + +pci_dev_put (dma_dev); }static void pch_dma_rx_complete (void *arg)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 288/658 tty: serial: clean up stop-tx part in altera_uart_tx_chars()
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit d9c128117da41cf4cb0e80ae565b5d3ac79dffac ]
The "stop TX" path in altera_uart_tx_chars() is open-coded, so:
* use uart_circ_empty() to check if the buffer is empty, and
* when true, call altera_uart_stop_tx().
Stable-dep-of: 1307c5d33cce ("serial: altera_uart: fix locking in polling mode")
--- drivers/tty/serial/altera_uart.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/tty/serial/altera_uart.c +2 -4
@@ -274,10 +274,8 @@ static void altera_uart_tx_chars(struct altera_uart *pp)if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )uart_write_wakeup (port); -if (xmit->head == xmit->tail) { - pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK ; -altera_uart_update_ctrl_reg (pp); - } +if (uart_circ_empty (xmit)) +altera_uart_stop_tx (port); }static irqreturn_t altera_uart_interrupt (int irq,void *data)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 289/658 tty: serial: altera_uart_{r,t}x_chars() need only uart_port
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit 3af44d9bb0539d5fa27d6159d696fda5f3747bff ]
Both altera_uart_{r,t}x_chars() need only uart_port, not altera_uart. So pass the former from altera_uart_interrupt() directly.
Apart it maybe saves a dereference, this makes the transition of altera_uart_tx_chars() easier to follow in the next patch.
Stable-dep-of: 1307c5d33cce ("serial: altera_uart: fix locking in polling mode")
--- drivers/tty/serial/altera_uart.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/tty/serial/altera_uart.c +4 -6
@@ -199,9 +199,8 @@ static void altera_uart_set_termios(struct uart_port *port,*/ } -static void altera_uart_rx_chars (struct altera_uart *pp) +static void altera_uart_rx_chars (struct uart_port *port) { -struct uart_port *port = &pp->port;unsigned char ch, flag;unsigned short status;
@@ -248,9 +247,8 @@ static void altera_uart_rx_chars(struct altera_uart *pp)spin_lock (&port->lock); } -static void altera_uart_tx_chars (struct altera_uart *pp) +static void altera_uart_tx_chars (struct uart_port *port) { -struct uart_port *port = &pp->port;struct circ_buf *xmit = &port->state->xmit;if (port->x_char) {
@@ -288,9 +286,9 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data)spin_lock (&port->lock);if (isr &ALTERA_UART_STATUS_RRDY_MSK ) -altera_uart_rx_chars (pp); +altera_uart_rx_chars (port);if (isr &ALTERA_UART_STATUS_TRDY_MSK ) -altera_uart_tx_chars (pp); +altera_uart_tx_chars (port);spin_unlock (&port->lock);return IRQ_RETVAL (isr);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 290/658 serial: altera_uart: fix locking in polling mode
In reply to Greg Kroah-HartmanFrom: Gabriel Somlo <[email protected]>
[ Upstream commit 1307c5d33cce8a41dd77c2571e4df65a5b627feb ]
Since altera_uart_interrupt() may also be called from a poll timer in "serving_softirq" context, use spin_[lock_irqsave|unlock_irqrestore] variants, which are appropriate for both softirq and hardware interrupt contexts.
--- drivers/tty/serial/altera_uart.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/altera_uart.c +3 -2
@@ -280,16 +280,17 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data) {struct uart_port *port = data; struct altera_uart *pp = container_of(port, struct altera_uart, port); +unsigned long flags;unsigned int isr; isr =altera_uart_readl (port,ALTERA_UART_STATUS_REG ) & pp->imr; -spin_lock (&port->lock); +spin_lock_irqsave (&port->lock, flags);if (isr &ALTERA_UART_STATUS_RRDY_MSK )altera_uart_rx_chars (port);if (isr &ALTERA_UART_STATUS_TRDY_MSK )altera_uart_tx_chars (port); -spin_unlock (&port->lock); +spin_unlock_irqrestore (&port->lock, flags);return IRQ_RETVAL (isr); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 291/658 serial: sunsab: Fix error handling in sunsab_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 1a6ec673fb627c26e2267ca0a03849f91dbd9b40 ]
The sunsab_init() returns the platform_driver_register() directly without checking its return value, if platform_driver_register() failed, the allocated sunsab_ports is leaked.
Fix by free sunsab_ports and set it to NULL when platform_driver_register() failed.
--- drivers/tty/serial/sunsab.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/tty/serial/sunsab.c +7 -1
@@ -1140,7 +1140,13 @@ static int __init sunsab_init(void) } } -return platform_driver_register (&sab_driver); + err =platform_driver_register (&sab_driver); +if (err) { +kfree (sunsab_ports); + sunsab_ports =NULL ; + } + +return err; } static void __exit sunsab_exit(void)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 292/658 test_firmware: fix memory leak in test_firmware_init()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 7610615e8cdb3f6f5bbd9d8e7a5d8a63e3cabf2e ]
When misc_register() failed in test_firmware_init(), the memory pointed by test_fw_config->name is not released. The memory leak information is as follows:
unreferenced object 0xffff88810a34cb00 (size 32):
comm "insmod", pid 7952, jiffies 4294948236 (age 49.060s) hex dump (first 32 bytes):
74 65 73 74 2d 66 69 72 6d 77 61 72 65 2e 62 69 test-firmware.bi
6e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 n...............
backtrace:
[<ffffffff81b21fcb>] __kmalloc_node_track_caller+0x4b/0xc0
[<ffffffff81affb96>] kstrndup+0x46/0xc0
[<ffffffffa0403a49>] __test_firmware_config_init+0x29/0x380 [test_firmware]
[<ffffffffa040f068>] 0xffffffffa040f068
[<ffffffff81002c41>] do_one_initcall+0x141/0x780
[<ffffffff816a72c3>] do_init_module+0x1c3/0x630
[<ffffffff816adb9e>] load_module+0x623e/0x76a0
[<ffffffff816af471>] __do_sys_finit_module+0x181/0x240
[<ffffffff89978f99>] do_syscall_64+0x39/0xb0
[<ffffffff89a0008b>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- lib/test_firmware.c | 1 + 1 file changed, 1 insertion(+)
lib/test_firmware.c +1 -0
@@ -940,6 +940,7 @@ static int __init test_firmware_init(void) rc =misc_register (&test_fw_misc_device);if (rc) { +__test_firmware_config_free ();kfree (test_fw_config);pr_err ("could not register misc device: %d\n" , rc);return rc;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 293/658 misc: ocxl: fix possible name leak in ocxl_file_register_afu()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit a4cb1004aeed2ab893a058fad00a5b41a12c4691 ]
If device_register() returns error in ocxl_file_register_afu(), the name allocated by dev_set_name() need be freed. As comment of device_register() says, it should use put_device() to give up the reference in the error path. So fix this by calling put_device(), then the name can be freed in kobject_cleanup(), and info is freed in info_release().
--- drivers/misc/ocxl/file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/misc/ocxl/file.c +5 -2
@@ -543,8 +543,11 @@ int ocxl_file_register_afu(struct ocxl_afu *afu) goto err_put; rc =device_register (&info->dev); -if (rc) - goto err_put; +if (rc) { +free_minor (info); +put_device (&info->dev); +return rc; + } rc =ocxl_sysfs_register_afu (info);if (rc)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 294/658 misc: tifm: fix possible memory leak in tifm_7xx1_switch_media()
In reply to Greg Kroah-HartmanFrom: ruanjinjie <[email protected]>
[ Upstream commit fd2c930cf6a5b9176382c15f9acb1996e76e25ad ]
If device_register() returns error in tifm_7xx1_switch_media(), name of kobject which is allocated in dev_set_name() called in device_add() is leaked.
Never directly free @dev after calling device_register(), even if it returned an error! Always use put_device() to give up the reference initialized.
--- drivers/misc/tifm_7xx1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/tifm_7xx1.c +1 -1
@@ -190,7 +190,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work)spin_unlock_irqrestore (&fm->lock, flags); }if (sock) -tifm_free_device (&sock->dev); +put_device (&sock->dev); }spin_lock_irqsave (&fm->lock, flags); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 295/658 misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit 643a16a0eb1d6ac23744bb6e90a00fc21148a9dc ]
In some bad situation, the gts may be freed gru_check_chiplet_assignment. The call chain can be gru_unload_context->gru_free_gru_context->gts_drop and kfree finally. However, the caller didn't know if the gts is freed or not and use it afterwards. This will trigger a Use after Free bug.
Fix it by introducing a return value to see if it's in error path or not. Free the gts in caller if gru_check_chiplet_assignment check failed.
--- drivers/misc/sgi-gru/grufault.c | 13 +++++++++++-- drivers/misc/sgi-gru/grumain.c | 22 ++++++++++++++++++---- drivers/misc/sgi-gru/grutables.h | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-)
drivers/misc/sgi-gru/grufault.c +11 -2
@@ -648,6 +648,7 @@ int gru_handle_user_call_os(unsigned long cb)if ((cb & (GRU_HANDLE_STRIDE -1 )) || ucbnum >=GRU_NUM_CB )return -EINVAL ; +again: gts =gru_find_lock_gts (cb);if (!gts)return -EINVAL ;
@@ -656,7 +657,11 @@ int gru_handle_user_call_os(unsigned long cb)if (ucbnum >= gts->ts_cbr_au_count *GRU_CBR_AU_SIZE ) goto exit; -gru_check_context_placement (gts); +if (gru_check_context_placement (gts)) { +gru_unlock_gts (gts); +gru_unload_context (gts,1 ); + goto again; + }/* * CCH may contain stale data if ts_force_cch_reload is set.
@@ -874,7 +879,11 @@ int gru_set_context_option(unsigned long arg) }else { gts->ts_user_blade_id = req.val1; gts->ts_user_chiplet_id = req.val0; -gru_check_context_placement (gts); +if (gru_check_context_placement (gts)) { +gru_unlock_gts (gts); +gru_unload_context (gts,1 ); +return ret; + } }break ;case sco_gseg_owner:
drivers/misc/sgi-gru/grumain.c +18 -4
@@ -716,9 +716,10 @@ static int gru_check_chiplet_assignment(struct gru_state *gru,* chiplet. Misassignment can occur if the process migrates to a different * blade or if the user changes the selected blade/chiplet. */ -void gru_check_context_placement (struct gru_thread_state *gts) +int gru_check_context_placement (struct gru_thread_state *gts) {struct gru_state *gru; +int ret =0 ;/* * If the current task is the context owner, verify that the
@@ -726,15 +727,23 @@ void gru_check_context_placement(struct gru_thread_state *gts)* references. Pthread apps use non-owner references to the CBRs. */ gru = gts->ts_gru; +/* +* If gru or gts->ts_tgid_owner isn't initialized properly, return +* success to indicate that the caller does not need to unload the +* gru context.The caller is responsible for their inspection and +* reinitialization if needed. +*/ if (!gru || gts->ts_tgid_owner != current->tgid) -return ; +return ret;if (!gru_check_chiplet_assignment (gru, gts)) {STAT (check_context_unload); -gru_unload_context (gts,1 ); + ret = -EINVAL ; }else if (gru_retarget_intr (gts)) {STAT (check_context_retarget_intr); } + +return ret; }
@@ -934,7 +943,12 @@ vm_fault_t gru_fault(struct vm_fault *vmf)mutex_lock (>s->ts_ctxlock);preempt_disable (); -gru_check_context_placement (gts); +if (gru_check_context_placement (gts)) { +preempt_enable (); +mutex_unlock (>s->ts_ctxlock); +gru_unload_context (gts,1 ); +return VM_FAULT_NOPAGE ; + }if (!gts->ts_gru) {STAT (load_user_context);
drivers/misc/sgi-gru/grutables.h +1 -1
@@ -637,7 +637,7 @@ extern int gru_user_flush_tlb(unsigned long arg);extern int gru_user_unload_context (unsigned long arg);extern int gru_get_exception_detail (unsigned long arg);extern int gru_set_context_option (unsigned long address); -extern void gru_check_context_placement (struct gru_thread_state *gts); +extern int gru_check_context_placement (struct gru_thread_state *gts);extern int gru_cpu_fault_map_id (void );extern struct vm_area_struct *gru_find_vma (unsigned long vaddr);extern void gru_flush_all_tlb (struct gru_state *gru);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 296/658 cxl: fix possible null-ptr-deref in cxl_guest_init_afu|adapter()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 61c80d1c3833e196256fb060382db94f24d3d9a7 ]
If device_register() fails in cxl_register_afu|adapter(), the device is not added, device_unregister() can not be called in the error path, otherwise it will cause a null-ptr-deref because of removing not added device.
As comment of device_register() says, it should use put_device() to give up the reference in the error path. So split device_unregister() into device_del() and put_device(), then goes to put dev when register fails.
--- drivers/misc/cxl/guest.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/misc/cxl/guest.c +14 -10
@@ -959,10 +959,10 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_n* if it returns an error! */ if ((rc =cxl_register_afu (afu))) - goto err_put1; + goto err_put_dev;if ((rc =cxl_sysfs_afu_add (afu))) - goto err_put1; + goto err_del_dev;/* * pHyp doesn't expose the programming models supported by the
@@ -978,7 +978,7 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_n afu->modes_supported =CXL_MODE_DIRECTED ;if ((rc =cxl_afu_select_best_mode (afu))) - goto err_put2; + goto err_remove_sysfs; adapter->afu[afu->slice] = afu;
@@ -998,10 +998,12 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_nreturn 0 ; -err_put2: +err_remove_sysfs:cxl_sysfs_afu_remove (afu); -err_put1: -device_unregister (&afu->dev); +err_del_dev: +device_del (&afu->dev); +err_put_dev: +put_device (&afu->dev); free = false;guest_release_serr_irq (afu); err2:
@@ -1135,18 +1137,20 @@ struct cxl *cxl_guest_init_adapter(struct device_node *np, struct platform_devic* even if it returns an error! */ if ((rc =cxl_register_adapter (adapter))) - goto err_put1; + goto err_put_dev;if ((rc =cxl_sysfs_adapter_add (adapter))) - goto err_put1; + goto err_del_dev;/* release the context lock as the adapter is configured */ cxl_adapter_context_unlock (adapter);return adapter; -err_put1: -device_unregister (&adapter->dev); +err_del_dev: +device_del (&adapter->dev); +err_put_dev: +put_device (&adapter->dev); free = false;cxl_guest_remove_chardev (adapter); err1:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 297/658 cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 02cd3032b154fa02fdf90e7467abaeed889330b2 ]
If device_register() fails in cxl_pci_afu|adapter(), the device is not added, device_unregister() can not be called in the error path, otherwise it will cause a null-ptr-deref because of removing not added device.
As comment of device_register() says, it should use put_device() to give up the reference in the error path. So split device_unregister() into device_del() and put_device(), then goes to put dev when register fails.
--- drivers/misc/cxl/pci.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/misc/cxl/pci.c +12 -8
@@ -1164,10 +1164,10 @@ static int pci_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)* if it returns an error! */ if ((rc =cxl_register_afu (afu))) - goto err_put1; + goto err_put_dev;if ((rc =cxl_sysfs_afu_add (afu))) - goto err_put1; + goto err_del_dev; adapter->afu[afu->slice] = afu;
@@ -1176,10 +1176,12 @@ static int pci_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)return 0 ; -err_put1: +err_del_dev: +device_del (&afu->dev); +err_put_dev:pci_deconfigure_afu (afu);cxl_debugfs_afu_remove (afu); -device_unregister (&afu->dev); +put_device (&afu->dev);return rc; err_free_native:
@@ -1667,23 +1669,25 @@ static struct cxl *cxl_pci_init_adapter(struct pci_dev *dev)* even if it returns an error! */ if ((rc =cxl_register_adapter (adapter))) - goto err_put1; + goto err_put_dev;if ((rc =cxl_sysfs_adapter_add (adapter))) - goto err_put1; + goto err_del_dev;/* Release the context lock as adapter is configured */ cxl_adapter_context_unlock (adapter);return adapter; -err_put1: +err_del_dev: +device_del (&adapter->dev); +err_put_dev:/* This should mirror cxl_remove_adapter, except without the * sysfs parts */ cxl_debugfs_adapter_remove (adapter);cxl_deconfigure_adapter (adapter); -device_unregister (&adapter->dev); +put_device (&adapter->dev);return ERR_PTR (rc); err_release:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 298/658 counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update
In reply to Greg Kroah-HartmanFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit fd5ac974fc25feed084c2d1599d0dddb4e0556bc ]
The ARR (auto reload register) and CMP (compare) registers are successively written. The status bits to check the update of these registers are polled together with regmap_read_poll_timeout(). The condition to end the loop may become true, even if one of the register isn't correctly updated.
So ensure both status bits are set before clearing them.
--- drivers/counter/stm32-lptimer-cnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/counter/stm32-lptimer-cnt.c +1 -1
@@ -69,7 +69,7 @@ static int stm32_lptim_set_enable_state(struct stm32_lptim_cnt *priv,/* ensure CMP & ARR registers are properly written */ ret =regmap_read_poll_timeout (priv->regmap,STM32_LPTIM_ISR , val, - (val &STM32_LPTIM_CMPOK_ARROK ), + (val &STM32_LPTIM_CMPOK_ARROK ) ==STM32_LPTIM_CMPOK_ARROK ,100 ,1000 );if (ret)return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 299/658 usb: roles: fix of node refcount leak in usb_role_switch_is_parent()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 1ab30c610630da5391a373cddb8a065bf4c4bc01 ]
I got the following report while doing device(mt6370-tcpc) load test with CONFIG_OF_UNITTEST and CONFIG_OF_DYNAMIC enabled:
OF: ERROR: memory leak, expected refcount 1 instead of 2, of_node_get()/of_node_put() unbalanced - destroy cset entry:
attach overlay node /i2c/pmic@34
The 'parent' returned by fwnode_get_parent() with refcount incremented. it needs be put after using.
--- drivers/usb/roles/class.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/roles/class.c +4 -1
@@ -108,10 +108,13 @@ usb_role_switch_is_parent(struct fwnode_handle *fwnode)struct fwnode_handle *parent =fwnode_get_parent (fwnode);struct device *dev; -if (!parent || !fwnode_property_present (parent,"usb-role-switch" )) +if (!fwnode_property_present (parent,"usb-role-switch" )) { +fwnode_handle_put (parent);return NULL ; + } dev =class_find_device_by_fwnode (role_class, parent); +fwnode_handle_put (parent);return dev ?to_role_switch (dev) :ERR_PTR (-EPROBE_DEFER ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 300/658 usb: gadget: f_hid: optional SETUP/SET_REPORT mode
In reply to Greg Kroah-HartmanFrom: Maxim Devaev <[email protected]>
[ Upstream commit d7428bc26fc767942c38d74b80299bcd4f01e7cb ]
f_hid provides the OUT Endpoint as only way for receiving reports from the host. SETUP/SET_REPORT method is not supported, and this causes a number of compatibility problems with various host drivers, especially in the case of keyboard emulation using f_hid.
- Some hosts do not support the OUT Endpoint and ignore it, so it becomes impossible for the gadget to receive a report from the host. In the case of a keyboard, the gadget loses the ability to receive the status of the LEDs.
- Some BIOSes/UEFIs can't work with HID devices with the OUT Endpoint at all. This may be due to their bugs or incomplete implementation of the HID standard.
For example, absolutely all Apple UEFIs can't handle the OUT Endpoint if it goes after IN Endpoint in the descriptor and require the reverse order (OUT, IN) which is a violation of the standard. Other hosts either do not initialize gadgets with a descriptor containing the OUT Endpoint completely (like some HP and DELL BIOSes and embedded firmwares like on KVM switches), or initialize them, but will not poll the IN Endpoint.
This patch adds configfs option no_out_endpoint=1 to disable the OUT Endpoint and allows f_hid to receive reports from the host via SETUP/SET_REPORT.
Previously, there was such a feature in f_hid, but it was replaced by the OUT Endpoint [1] in the commit 99c515005857 ("usb: gadget: hidg:
register OUT INT endpoint for SET_REPORT"). So this patch actually returns the removed functionality while making it optional. For backward compatibility reasons, the OUT Endpoint mode remains the default behaviour.
- The OUT Endpoint mode provides the report queue and reduces USB overhead (eliminating SETUP routine) on transmitting a report from the host.
- If the SETUP/SET_REPORT mode is used, there is no report queue, so the userspace will only read last report. For classic HID devices like keyboards this is not a problem, since it's intended to transmit the status of the LEDs and only the last report is important. This mode provides better compatibility with strange and buggy host drivers.
Both modes passed USBCV tests. Checking with the USB protocol analyzer also confirmed that everything is working as it should and the new mode ensures operability in all of the described cases.
Stable-dep-of: 89ff3dfac604 ("usb: gadget: f_hid: fix f_hidg lifetime vs cdev")
--- drivers/usb/gadget/function/f_hid.c | 220 +++++++++++++++++++++++----- drivers/usb/gadget/function/u_hid.h | 1 + 2 files changed, 188 insertions(+), 33 deletions(-)
drivers/usb/gadget/function/f_hid.c +187 -33
@@ -45,12 +45,25 @@ struct f_hidg {unsigned short report_desc_length;char *report_desc;unsigned short report_length; +/* +* use_out_ep - if true, the OUT Endpoint (interrupt out method) +* will be used to receive reports from the host +* using functions with the "intout" suffix. +* Otherwise, the OUT Endpoint will not be configured +* and the SETUP/SET_REPORT method ("ssreport" suffix) +* will be used to receive reports. +*/ +bool use_out_ep;/* recv report */ -struct list_head completed_out_req;spinlock_t read_spinlock;wait_queue_head_t read_queue; +/* recv report - interrupt out only (use_out_ep == 1) */ +struct list_head completed_out_req;unsigned int qlen; +/* recv report - setup set_report only (use_out_ep == 0) */ +char *set_report_buf; +unsigned int set_report_length;/* send report */ spinlock_t write_spinlock;
@@ -79,7 +92,7 @@ static struct usb_interface_descriptor hidg_interface_desc = { .bDescriptorType = USB_DT_INTERFACE,/* .bInterfaceNumber = DYNAMIC */ .bAlternateSetting = 0, - .bNumEndpoints = 2, +/* .bNumEndpoints = DYNAMIC (depends on use_out_ep) */ .bInterfaceClass = USB_CLASS_HID,/* .bInterfaceSubClass = DYNAMIC */ /* .bInterfaceProtocol = DYNAMIC */
@@ -140,7 +153,7 @@ static struct usb_ss_ep_comp_descriptor hidg_ss_out_comp_desc = {/* .wBytesPerInterval = DYNAMIC */ }; -static struct usb_descriptor_header *hidg_ss_descriptors[] = { +static struct usb_descriptor_header *hidg_ss_descriptors_intout[] = { (struct usb_descriptor_header *)&hidg_interface_desc, (struct usb_descriptor_header *)&hidg_desc, (struct usb_descriptor_header *)&hidg_ss_in_ep_desc,
@@ -150,6 +163,14 @@ static struct usb_descriptor_header *hidg_ss_descriptors[] = { NULL, }; +static struct usb_descriptor_header *hidg_ss_descriptors_ssreport[] = { + (struct usb_descriptor_header *)&hidg_interface_desc, + (struct usb_descriptor_header *)&hidg_desc, + (struct usb_descriptor_header *)&hidg_ss_in_ep_desc, + (struct usb_descriptor_header *)&hidg_ss_in_comp_desc, +NULL , +}; +/* High-Speed Support */ static struct usb_endpoint_descriptor hidg_hs_in_ep_desc = {
@@ -176,7 +197,7 @@ static struct usb_endpoint_descriptor hidg_hs_out_ep_desc = {*/ }; -static struct usb_descriptor_header *hidg_hs_descriptors[] = { +static struct usb_descriptor_header *hidg_hs_descriptors_intout[] = { (struct usb_descriptor_header *)&hidg_interface_desc, (struct usb_descriptor_header *)&hidg_desc, (struct usb_descriptor_header *)&hidg_hs_in_ep_desc,
@@ -184,6 +205,13 @@ static struct usb_descriptor_header *hidg_hs_descriptors[] = { NULL, }; +static struct usb_descriptor_header *hidg_hs_descriptors_ssreport[] = { + (struct usb_descriptor_header *)&hidg_interface_desc, + (struct usb_descriptor_header *)&hidg_desc, + (struct usb_descriptor_header *)&hidg_hs_in_ep_desc, +NULL , +}; +/* Full-Speed Support */ static struct usb_endpoint_descriptor hidg_fs_in_ep_desc = {
@@ -210,7 +238,7 @@ static struct usb_endpoint_descriptor hidg_fs_out_ep_desc = {*/ }; -static struct usb_descriptor_header *hidg_fs_descriptors[] = { +static struct usb_descriptor_header *hidg_fs_descriptors_intout[] = { (struct usb_descriptor_header *)&hidg_interface_desc, (struct usb_descriptor_header *)&hidg_desc, (struct usb_descriptor_header *)&hidg_fs_in_ep_desc,
@@ -218,6 +246,13 @@ static struct usb_descriptor_header *hidg_fs_descriptors[] = { NULL, }; +static struct usb_descriptor_header *hidg_fs_descriptors_ssreport[] = { + (struct usb_descriptor_header *)&hidg_interface_desc, + (struct usb_descriptor_header *)&hidg_desc, + (struct usb_descriptor_header *)&hidg_fs_in_ep_desc, +NULL , +}; +/*-------------------------------------------------------------------------*/ /* Strings */
@@ -241,8 +276,8 @@ static struct usb_gadget_strings *ct_func_strings[] = {/*-------------------------------------------------------------------------*/ /* Char Device */ -static ssize_t f_hidg_read (struct file *file,char __user *buffer, -size_t count,loff_t *ptr) +static ssize_t f_hidg_intout_read (struct file *file,char __user *buffer, +size_t count,loff_t *ptr) {struct f_hidg *hidg = file->private_data;struct f_hidg_req_list *list;
@@ -258,15 +293,15 @@ static ssize_t f_hidg_read(struct file *file, char __user *buffer,spin_lock_irqsave (&hidg->read_spinlock, flags); -#define READ_COND (!list_empty(&hidg->completed_out_req)) +#define READ_COND_INTOUT (!list_empty(&hidg->completed_out_req))/* wait for at least one buffer to complete */ -while (!READ_COND ) { +while (!READ_COND_INTOUT ) {spin_unlock_irqrestore (&hidg->read_spinlock, flags);if (file->f_flags &O_NONBLOCK )return -EAGAIN ; -if (wait_event_interruptible (hidg->read_queue,READ_COND )) +if (wait_event_interruptible (hidg->read_queue,READ_COND_INTOUT ))return -ERESTARTSYS ;spin_lock_irqsave (&hidg->read_spinlock, flags);
@@ -316,6 +351,60 @@ static ssize_t f_hidg_read(struct file *file, char __user *buffer,return count; } +#define READ_COND_SSREPORT (hidg->set_report_buf != NULL) + +static ssize_t f_hidg_ssreport_read (struct file *file,char __user *buffer, +size_t count,loff_t *ptr) +{ +struct f_hidg *hidg = file->private_data; +char *tmp_buf =NULL ; +unsigned long flags; + +if (!count) +return 0 ; + +spin_lock_irqsave (&hidg->read_spinlock, flags); + +while (!READ_COND_SSREPORT ) { +spin_unlock_irqrestore (&hidg->read_spinlock, flags); +if (file->f_flags &O_NONBLOCK ) +return -EAGAIN ; + +if (wait_event_interruptible (hidg->read_queue,READ_COND_SSREPORT )) +return -ERESTARTSYS ; + +spin_lock_irqsave (&hidg->read_spinlock, flags); + } + + count = min_t(unsigned int, count, hidg->set_report_length); + tmp_buf = hidg->set_report_buf; + hidg->set_report_buf =NULL ; + +spin_unlock_irqrestore (&hidg->read_spinlock, flags); + +if (tmp_buf !=NULL ) { + count -=copy_to_user (buffer, tmp_buf, count); +kfree (tmp_buf); + }else { + count = -ENOMEM ; + } + +wake_up (&hidg->read_queue); + +return count; +} + +static ssize_t f_hidg_read (struct file *file,char __user *buffer, +size_t count,loff_t *ptr) +{ +struct f_hidg *hidg = file->private_data; + +if (hidg->use_out_ep) +return f_hidg_intout_read (file, buffer, count, ptr); +else +return f_hidg_ssreport_read (file, buffer, count, ptr); +} +static void f_hidg_req_complete (struct usb_ep *ep,struct usb_request *req) {struct f_hidg *hidg = (struct f_hidg *)ep->driver_data;
@@ -439,14 +528,20 @@ static __poll_t f_hidg_poll(struct file *file, poll_table *wait)if (WRITE_COND ) ret |=EPOLLOUT |EPOLLWRNORM ; -if (READ_COND ) - ret |=EPOLLIN |EPOLLRDNORM ; +if (hidg->use_out_ep) { +if (READ_COND_INTOUT ) + ret |=EPOLLIN |EPOLLRDNORM ; + }else { +if (READ_COND_SSREPORT ) + ret |=EPOLLIN |EPOLLRDNORM ; + }return ret; }#undef WRITE_COND -#undef READ_COND +#undef READ_COND_SSREPORT +#undef READ_COND_INTOUTstatic int f_hidg_release (struct inode *inode,struct file *fd) {
@@ -473,7 +568,7 @@ static inline struct usb_request *hidg_alloc_ep_req(struct usb_ep *ep,return alloc_ep_req (ep, length); } -static void hidg_set_report_complete (struct usb_ep *ep,struct usb_request *req) +static void hidg_intout_complete (struct usb_ep *ep,struct usb_request *req) {struct f_hidg *hidg = (struct f_hidg *) req->context;struct usb_composite_dev *cdev = hidg->func.config->cdev;
@@ -508,6 +603,37 @@ static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req) } } +static void hidg_ssreport_complete (struct usb_ep *ep,struct usb_request *req) +{ +struct f_hidg *hidg = (struct f_hidg *)req->context; +struct usb_composite_dev *cdev = hidg->func.config->cdev; +char *new_buf =NULL ; +unsigned long flags; + +if (req->status !=0 || req->buf ==NULL || req->actual ==0 ) { +ERROR (cdev, +"%s FAILED: status=%d, buf=%p, actual=%d\n" , + __func__, req->status, req->buf, req->actual); +return ; + } + +spin_lock_irqsave (&hidg->read_spinlock, flags); + + new_buf =krealloc (hidg->set_report_buf, req->actual,GFP_ATOMIC ); +if (new_buf ==NULL ) { +spin_unlock_irqrestore (&hidg->read_spinlock, flags); +return ; + } + hidg->set_report_buf = new_buf; + + hidg->set_report_length = req->actual; +memcpy (hidg->set_report_buf, req->buf, req->actual); + +spin_unlock_irqrestore (&hidg->read_spinlock, flags); + +wake_up (&hidg->read_queue); +} +static int hidg_setup (struct usb_function *f,const struct usb_ctrlrequest *ctrl) {
@@ -555,7 +681,11 @@ static int hidg_setup(struct usb_function *f,case ((USB_DIR_OUT |USB_TYPE_CLASS |USB_RECIP_INTERFACE ) <<8 |HID_REQ_SET_REPORT ):VDBG (cdev,"set_report | wLength=%d\n" , ctrl->wLength); - goto stall; +if (hidg->use_out_ep) + goto stall; + req->complete = hidg_ssreport_complete; + req->context = hidg; + goto respond;break ; case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8
@@ -643,15 +773,18 @@ static void hidg_disable(struct usb_function *f)unsigned long flags;usb_ep_disable (hidg->in_ep); -usb_ep_disable (hidg->out_ep); -spin_lock_irqsave (&hidg->read_spinlock, flags); -list_for_each_entry_safe (list, next, &hidg->completed_out_req, list) { -free_ep_req (hidg->out_ep, list->req); -list_del (&list->list); -kfree (list); +if (hidg->out_ep) { +usb_ep_disable (hidg->out_ep); + +spin_lock_irqsave (&hidg->read_spinlock, flags); +list_for_each_entry_safe (list, next, &hidg->completed_out_req, list) { +free_ep_req (hidg->out_ep, list->req); +list_del (&list->list); +kfree (list); + } +spin_unlock_irqrestore (&hidg->read_spinlock, flags); } -spin_unlock_irqrestore (&hidg->read_spinlock, flags);spin_lock_irqsave (&hidg->write_spinlock, flags);if (!hidg->write_pending) {
@@ -697,8 +830,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) } } - -if (hidg->out_ep !=NULL ) { +if (hidg->use_out_ep && hidg->out_ep !=NULL ) {/* restart endpoint */ usb_ep_disable (hidg->out_ep);
@@ -723,7 +855,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)hidg_alloc_ep_req (hidg->out_ep, hidg->report_length);if (req) { - req->complete = hidg_set_report_complete; + req->complete = hidg_intout_complete; req->context = hidg; status =usb_ep_queue (hidg->out_ep, req,GFP_ATOMIC );
@@ -749,7 +881,8 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) }return 0 ; disable_out_ep: -usb_ep_disable (hidg->out_ep); +if (hidg->out_ep) +usb_ep_disable (hidg->out_ep); free_req_in:if (req_in)free_ep_req (hidg->in_ep, req_in);
@@ -801,14 +934,21 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) goto fail; hidg->in_ep = ep; - ep =usb_ep_autoconfig (c->cdev->gadget, &hidg_fs_out_ep_desc); -if (!ep) - goto fail; - hidg->out_ep = ep; + hidg->out_ep =NULL ; +if (hidg->use_out_ep) { + ep =usb_ep_autoconfig (c->cdev->gadget, &hidg_fs_out_ep_desc); +if (!ep) + goto fail; + hidg->out_ep = ep; + } + +/* used only if use_out_ep == 1 */ + hidg->set_report_buf =NULL ;/* set descriptor dynamic values */ hidg_interface_desc.bInterfaceSubClass = hidg->bInterfaceSubClass; hidg_interface_desc.bInterfaceProtocol = hidg->bInterfaceProtocol; + hidg_interface_desc.bNumEndpoints = hidg->use_out_ep ?2 :1 ; hidg->protocol =HID_REPORT_PROTOCOL ; hidg->idle =1 ; hidg_ss_in_ep_desc.wMaxPacketSize =cpu_to_le16 (hidg->report_length);
@@ -839,9 +979,19 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) hidg_ss_out_ep_desc.bEndpointAddress = hidg_fs_out_ep_desc.bEndpointAddress; - status =usb_assign_descriptors (f, hidg_fs_descriptors, - hidg_hs_descriptors, hidg_ss_descriptors, - hidg_ss_descriptors); +if (hidg->use_out_ep) + status =usb_assign_descriptors (f, + hidg_fs_descriptors_intout, + hidg_hs_descriptors_intout, + hidg_ss_descriptors_intout, + hidg_ss_descriptors_intout); +else + status =usb_assign_descriptors (f, + hidg_fs_descriptors_ssreport, + hidg_hs_descriptors_ssreport, + hidg_ss_descriptors_ssreport, + hidg_ss_descriptors_ssreport); +if (status) goto fail;
@@ -956,6 +1106,7 @@ CONFIGFS_ATTR(f_hid_opts_, name)F_HID_OPT (subclass,8 ,255 );F_HID_OPT (protocol,8 ,255 ); +F_HID_OPT (no_out_endpoint,8 ,1 );F_HID_OPT (report_length,16 ,65535 );static ssize_t f_hid_opts_report_desc_show (struct config_item *item,char *page)
@@ -1015,6 +1166,7 @@ CONFIGFS_ATTR_RO(f_hid_opts_, dev);static struct configfs_attribute *hid_attrs[] = { &f_hid_opts_attr_subclass, &f_hid_opts_attr_protocol, + &f_hid_opts_attr_no_out_endpoint, &f_hid_opts_attr_report_length, &f_hid_opts_attr_report_desc, &f_hid_opts_attr_dev,
@@ -1099,6 +1251,7 @@ static void hidg_free(struct usb_function *f) hidg =func_to_hidg (f); opts = container_of(f->fi, struct f_hid_opts, func_inst);kfree (hidg->report_desc); +kfree (hidg->set_report_buf);kfree (hidg);mutex_lock (&opts->lock); --opts->refcnt;
@@ -1145,6 +1298,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi)return ERR_PTR (-ENOMEM ); } } + hidg->use_out_ep = !opts->no_out_endpoint;mutex_unlock (&opts->lock);
drivers/usb/gadget/function/u_hid.h +1 -0
@@ -20,6 +20,7 @@ struct f_hid_opts {int minor;unsigned char subclass;unsigned char protocol; +unsigned char no_out_endpoint;unsigned short report_length;unsigned short report_desc_length;unsigned char *report_desc;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 301/658 usb: gadget: f_hid: fix f_hidg lifetime vs cdev
In reply to Greg Kroah-HartmanFrom: John Keeping <[email protected]>
[ Upstream commit 89ff3dfac604614287ad5aad9370c3f984ea3f4b ]
The embedded struct cdev does not have its lifetime correctly tied to the enclosing struct f_hidg, so there is a use-after-free if /dev/hidgN is held open while the gadget is deleted.
This can readily be replicated with libusbgx's example programs (for conciseness - operating directly via configfs is equivalent):
gadget-hid exec 3<> /dev/hidg0 gadget-vid-pid-remove exec 3<&-
Pull the existing device up in to struct f_hidg and make use of the cdev_device_{add,del}() helpers. This changes the lifetime of the device object to match struct f_hidg, but note that it is still added and deleted at the same time.
--- drivers/usb/gadget/function/f_hid.c | 52 ++++++++++++++++------------- 1 file changed, 28 insertions(+), 24 deletions(-)
drivers/usb/gadget/function/f_hid.c +28 -24
@@ -71,7 +71,7 @@ struct f_hidg {wait_queue_head_t write_queue;struct usb_request *req; -int minor; +struct device dev;struct cdev cdev;struct usb_function func;
@@ -84,6 +84,14 @@ static inline struct f_hidg *func_to_hidg(struct usb_function *f) return container_of(f, struct f_hidg, func); } +static void hidg_release (struct device *dev) +{ + struct f_hidg *hidg = container_of(dev, struct f_hidg, dev); + +kfree (hidg->set_report_buf); +kfree (hidg); +} +/*-------------------------------------------------------------------------*/ /* Static descriptors */
@@ -910,9 +918,7 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)struct usb_ep *ep;struct f_hidg *hidg =func_to_hidg (f);struct usb_string *us; -struct device *device;int status; -dev_t dev;/* maybe allocate device-global string IDs, and patch descriptors */ us = usb_gstrings_attach(c->cdev, ct_func_strings,
@@ -1005,21 +1011,11 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)/* create char device */ cdev_init (&hidg->cdev, &f_hidg_fops); - dev =MKDEV (major, hidg->minor); - status =cdev_add (&hidg->cdev, dev,1 ); + status =cdev_device_add (&hidg->cdev, &hidg->dev);if (status) goto fail_free_descs; - device =device_create (hidg_class,NULL , dev,NULL , -"%s%d" ,"hidg" , hidg->minor); -if (IS_ERR (device)) { - status =PTR_ERR (device); - goto del; - } -return 0 ; -del: -cdev_del (&hidg->cdev); fail_free_descs:usb_free_all_descriptors (f); fail:
@@ -1250,9 +1246,7 @@ static void hidg_free(struct usb_function *f) hidg =func_to_hidg (f); opts = container_of(f->fi, struct f_hid_opts, func_inst); -kfree (hidg->report_desc); -kfree (hidg->set_report_buf); -kfree (hidg); +put_device (&hidg->dev);mutex_lock (&opts->lock); --opts->refcnt;mutex_unlock (&opts->lock);
@@ -1262,8 +1256,7 @@ static void hidg_unbind(struct usb_configuration *c, struct usb_function *f) {struct f_hidg *hidg =func_to_hidg (f); -device_destroy (hidg_class,MKDEV (major, hidg->minor)); -cdev_del (&hidg->cdev); +cdev_device_del (&hidg->cdev, &hidg->dev);usb_free_all_descriptors (f); }
@@ -1272,6 +1265,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) {struct f_hidg *hidg;struct f_hid_opts *opts; +int ret;/* allocate and initialize one new instance */ hidg =kzalloc (sizeof (*hidg),GFP_KERNEL );
@@ -1283,17 +1277,27 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi)mutex_lock (&opts->lock); ++opts->refcnt; - hidg->minor = opts->minor; +device_initialize (&hidg->dev); + hidg->dev.release = hidg_release; + hidg->dev.class = hidg_class; + hidg->dev.devt =MKDEV (major, opts->minor); + ret =dev_set_name (&hidg->dev,"hidg%d" , opts->minor); +if (ret) { + --opts->refcnt; +mutex_unlock (&opts->lock); +return ERR_PTR (ret); + } + hidg->bInterfaceSubClass = opts->subclass; hidg->bInterfaceProtocol = opts->protocol; hidg->report_length = opts->report_length; hidg->report_desc_length = opts->report_desc_length;if (opts->report_desc) { - hidg->report_desc =kmemdup (opts->report_desc, - opts->report_desc_length, -GFP_KERNEL ); + hidg->report_desc =devm_kmemdup (&hidg->dev, opts->report_desc, + opts->report_desc_length, +GFP_KERNEL );if (!hidg->report_desc) { -kfree (hidg); +put_device (&hidg->dev);mutex_unlock (&opts->lock);return ERR_PTR (-ENOMEM ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 302/658 usb: gadget: f_hid: fix refcount leak on error path
In reply to Greg Kroah-HartmanFrom: John Keeping <[email protected]>
[ Upstream commit 70a3288a7586526315105c699b687d78cd32559a ]
When failing to allocate report_desc, opts->refcnt has already been incremented so it needs to be decremented to avoid leaving the options structure permanently locked.
--- drivers/usb/gadget/function/f_hid.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/function/f_hid.c +1 -0
@@ -1298,6 +1298,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) GFP_KERNEL);if (!hidg->report_desc) {put_device (&hidg->dev); + --opts->refcnt;mutex_unlock (&opts->lock);return ERR_PTR (-ENOMEM ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 303/658 drivers: mcb: fix resource leak in mcb_probe()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit d7237462561fcd224fa687c56ccb68629f50fc0d ]
When probe hook function failed in mcb_probe(), it doesn't put the device. Compiled test only.
--- drivers/mcb/mcb-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mcb/mcb-core.c +3 -1
@@ -71,8 +71,10 @@ static int mcb_probe(struct device *dev)get_device (dev); ret = mdrv->probe (mdev, found_id); -if (ret) +if (ret) {module_put (carrier_mod); +put_device (dev); + }return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 304/658 mcb: mcb-parse: fix error handing in chameleon_parse_gdd()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 728ac3389296caf68638628c987aeae6c8851e2d ]
If mcb_device_register() returns error in chameleon_parse_gdd(), the refcount of bus and device name are leaked. Fix this by calling put_device() to give up the reference, so they can be released in mcb_release_dev() and kobject_cleanup().
--- drivers/mcb/mcb-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mcb/mcb-parse.c +1 -1
@@ -108,7 +108,7 @@ static int chameleon_parse_gdd(struct mcb_bus *bus,return 0 ; err: -mcb_free_dev (mdev); +put_device (&mdev->dev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 305/658 chardev: fix error handling in cdev_device_add()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 11fa7fefe3d8fac7da56bc9aa3dd5fb3081ca797 ]
While doing fault injection test, I got the following report:
------------[ cut here ]------------ kobject: '(null)' (0000000039956980): is not initialized, yet kobject_put() is being called. WARNING: CPU: 3 PID: 6306 at kobject_put+0x23d/0x4e0 CPU: 3 PID: 6306 Comm: 283 Tainted: G W 6.1.0-rc2-00005-g307c1086d7c9 #1253 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:kobject_put+0x23d/0x4e0 Call Trace: <TASK> cdev_device_add+0x15e/0x1b0 __iio_device_register+0x13b4/0x1af0 [industrialio] __devm_iio_device_register+0x22/0x90 [industrialio] max517_probe+0x3d8/0x6b4 [max517] i2c_device_probe+0xa81/0xc00
When device_add() is injected fault and returns error, if dev->devt is not set, cdev_add() is not called, cdev_del() is not needed. Fix this by checking dev->devt in error path.
--- fs/char_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/char_dev.c +1 -1
@@ -544,7 +544,7 @@ int cdev_device_add(struct cdev *cdev, struct device *dev) } rc =device_add (dev); -if (rc) +if (rc && dev->devt)cdev_del (cdev);return rc;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 306/658 i2c: pxa-pci: fix missing pci_disable_device() on error in ce4100_i2c_probe
In reply to Greg Kroah-HartmanFrom: Hui Tang <[email protected]>
[ Upstream commit d78a167332e1ca8113268ed922c1212fd71b73ad ]
Using pcim_enable_device() to avoid missing pci_disable_device().
--- drivers/i2c/busses/i2c-pxa-pci.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-pxa-pci.c +3 -7
@@ -105,7 +105,7 @@ static int ce4100_i2c_probe(struct pci_dev *dev,int i;struct ce4100_devices *sds; - ret =pci_enable_device_mem (dev); + ret =pcim_enable_device (dev);if (ret)return ret;
@@ -114,10 +114,8 @@ static int ce4100_i2c_probe(struct pci_dev *dev,return -EINVAL ; } sds =kzalloc (sizeof (*sds),GFP_KERNEL ); -if (!sds) { - ret = -ENOMEM ; - goto err_mem; - } +if (!sds) +return -ENOMEM ;for (i =0 ; i <ARRAY_SIZE (sds->pdev); i++) { sds->pdev[i] =add_i2c_device (dev, i);
@@ -133,8 +131,6 @@ static int ce4100_i2c_probe(struct pci_dev *dev, err_dev_add:kfree (sds); -err_mem: -pci_disable_device (dev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 307/658 staging: rtl8192u: Fix use after free in ieee80211_rx()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit bcc5e2dcf09089b337b76fc1a589f6ff95ca19ac ]
We cannot dereference the "skb" pointer after calling ieee80211_monitor_rx(), because it is a use after free.
--- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +3 -1
@@ -943,9 +943,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,#endif if (ieee->iw_mode ==IW_MODE_MONITOR ) { +unsigned int len = skb->len; +ieee80211_monitor_rx (ieee, skb, rx_stats); stats->rx_packets++; - stats->rx_bytes += skb->len; + stats->rx_bytes += len;return 1 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 308/658 staging: rtl8192e: Fix potential use-after-free in rtllib_rx_Monitor()
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit d30f4436f364b4ad915ca2c09be07cd0f93ceb44 ]
The skb is delivered to netif_rx() in rtllib_monitor_rx(), which may free it, after calling this, dereferencing skb may trigger use-after-free. Found by Smatch.
--- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192e/rtllib_rx.c +1 -1
@@ -1490,9 +1490,9 @@ static int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb, hdrlen +=4 ; } -rtllib_monitor_rx (ieee, skb, rx_stats, hdrlen); ieee->stats.rx_packets++; ieee->stats.rx_bytes += skb->len; +rtllib_monitor_rx (ieee, skb, rx_stats, hdrlen);return 1 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 309/658 vme: Fix error not catched in fake_init()
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 7bef797d707f1744f71156b21d41e3b8c946631f ]
In fake_init(), __root_device_register() is possible to fail but it's ignored, which can cause unregistering vme_root fail when exit.
general protection fault, probably for non-canonical address 0xdffffc000000008c KASAN: null-ptr-deref in range [0x0000000000000460-0x0000000000000467] RIP: 0010:root_device_unregister+0x26/0x60 Call Trace: <TASK> __x64_sys_delete_module+0x34f/0x540 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Return error when __root_device_register() fails.
--- drivers/vme/bridges/vme_fake.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/vme/bridges/vme_fake.c +2 -0
@@ -1073,6 +1073,8 @@ static int __init fake_init(void)/* We need a fake parent device */ vme_root =__root_device_register ("vme" ,THIS_MODULE ); +if (IS_ERR (vme_root)) +return PTR_ERR (vme_root);/* If we want to support more than one bridge at some point, we need to * dynamically allocate this so we get one per device.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 310/658 drivers: provide devm_platform_get_and_ioremap_resource()
In reply to Greg Kroah-HartmanFrom: Dejin Zheng <[email protected]>
[ Upstream commit 890cc39a879906b63912482dfc41944579df2dc6 ]
Since commit "drivers: provide devm_platform_ioremap_resource()", it was wrap platform_get_resource() and devm_ioremap_resource() as single helper devm_platform_ioremap_resource(). but now, many drivers still used platform_get_resource() and devm_ioremap_resource() together in the kernel tree. The reason can not be replaced is they still need use the resource variables obtained by platform_get_resource(). so provide this helper.
Stable-dep-of: 2d47b79d2bd3 ("i2c: mux: reg: check return value after calling platform_get_resource()")
--- drivers/base/platform.c | 22 ++++++++++++++++++++++ include/linux/platform_device.h | 3 +++ 2 files changed, 25 insertions(+)
drivers/base/platform.c +22 -0
@@ -61,6 +61,28 @@ struct resource *platform_get_resource(struct platform_device *dev, }EXPORT_SYMBOL_GPL (platform_get_resource); +/** +* devm_platform_get_and_ioremap_resource - call devm_ioremap_resource() for a +* platform device and get resource +* +* @pdev: platform device to use both for memory resource lookup as well as +* resource management +* @index: resource index +* @res: optional output parameter to store a pointer to the obtained resource. +*/ +void __iomem * +devm_platform_get_and_ioremap_resource (struct platform_device *pdev, +unsigned int index,struct resource **res) +{ +struct resource *r; + + r =platform_get_resource (pdev,IORESOURCE_MEM , index); +if (res) + *res = r; +return devm_ioremap_resource (&pdev->dev, r); +} +EXPORT_SYMBOL_GPL (devm_platform_get_and_ioremap_resource); +/** * devm_platform_ioremap_resource - call devm_ioremap_resource() for a platform * device
include/linux/platform_device.h +3 -0
@@ -55,6 +55,9 @@ extern struct device * platform_find_device_by_driver(struct device *start, const struct device_driver *drv);extern void __iomem * +devm_platform_get_and_ioremap_resource (struct platform_device *pdev, +unsigned int index,struct resource **res); +extern void __iomem *devm_platform_ioremap_resource (struct platform_device *pdev,unsigned int index);extern int platform_get_irq (struct platform_device *,unsigned int );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 311/658 i2c: mux: reg: check return value after calling platform_get_resource()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 2d47b79d2bd39cc6369eccf94a06568d84c906ae ]
It will cause null-ptr-deref in resource_size(), if platform_get_resource() returns NULL, move calling resource_size() after devm_ioremap_resource() that will check 'res' to avoid null-ptr-deref.
And use devm_platform_get_and_ioremap_resource() to simplify code.
--- drivers/i2c/muxes/i2c-mux-reg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/i2c/muxes/i2c-mux-reg.c +2 -3
@@ -187,13 +187,12 @@ static int i2c_mux_reg_probe(struct platform_device *pdev)if (!mux->data.reg) {dev_info (&pdev->dev,"Register not set, using platform resource\n" ); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - mux->data.reg_size =resource_size (res); - mux->data.reg =devm_ioremap_resource (&pdev->dev, res); + mux->data.reg =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (mux->data.reg)) { ret =PTR_ERR (mux->data.reg); goto err_put_parent; } + mux->data.reg_size =resource_size (res); } if (mux->data.reg_size != 4 && mux->data.reg_size != 2 &&
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 312/658 i2c: ismt: Fix an out-of-bounds bug in ismt_access()
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 39244cc754829bf707dccd12e2ce37510f5b1f8d ]
When the driver does not check the data from the user, the variable 'data->block[0]' may be very large to cause an out-of-bounds bug.
The following log can reveal it:
[ 33.995542] i2c i2c-1: ioctl, cmd=0x720, arg=0x7ffcb3dc3a20 [ 33.995978] ismt_smbus 0000:00:05.0: I2C_SMBUS_BLOCK_DATA: WRITE [ 33.996475] ================================================================== [ 33.996995] BUG: KASAN: out-of-bounds in ismt_access.cold+0x374/0x214b [ 33.997473] Read of size 18446744073709551615 at addr ffff88810efcfdb1 by task ismt_poc/485 [ 33.999450] Call Trace: [ 34.001849] memcpy+0x20/0x60 [ 34.002077] ismt_access.cold+0x374/0x214b [ 34.003382] __i2c_smbus_xfer+0x44f/0xfb0 [ 34.004007] i2c_smbus_xfer+0x10a/0x390 [ 34.004291] i2cdev_ioctl_smbus+0x2c8/0x710 [ 34.005196] i2cdev_ioctl+0x5ec/0x74c
Fix this bug by checking the size of 'data->block[0]' first.
--- drivers/i2c/busses/i2c-ismt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-ismt.c +3 -0
@@ -506,6 +506,9 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,if (read_write ==I2C_SMBUS_WRITE ) {/* Block Write */ dev_dbg (dev,"I2C_SMBUS_BLOCK_DATA: WRITE\n" ); +if (data->block[0 ] <1 || data->block[0 ] >I2C_SMBUS_BLOCK_MAX ) +return -EINVAL ; + dma_size = data->block[0 ] +1 ; dma_direction =DMA_TO_DEVICE ; desc->wr_len_cmd = dma_size;
Signature · 1 line
2.35.1