scsi: qedf: Set qed_slowpath_params to zero before use
Subsystems (10)
Sasha Levin
maintainerPATCH 1/13 scsi: qedf: Set qed_slowpath_params to zero before use
From: Saurav Kashyap <[email protected]>
[ Upstream commit 6c3bb589debd763dc4b94803ddf3c13b4fcca776 ]
Zero qed_slowpath_params before use.
--- drivers/scsi/qedf/qedf_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qedf/qedf_main.c +1 -0
@@ -3453,6 +3453,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) }/* Start the Slowpath-process */ +memset (&slowpath_params,0 ,sizeof (struct qed_slowpath_params )); slowpath_params.int_mode =QED_INT_MODE_MSIX ; slowpath_params.drv_major =QEDF_DRIVER_MAJOR_VER ; slowpath_params.drv_minor =QEDF_DRIVER_MINOR_VER ;
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 2/13 ACPI: EC: Abort address space access upon error
From: Armin Wolf <[email protected]>
[ Upstream commit f6f172dc6a6d7775b2df6adfd1350700e9a847ec ]
When a multi-byte address space access is requested, acpi_ec_read()/ acpi_ec_write() is being called multiple times.
Abort such operations if a single call to acpi_ec_read() / acpi_ec_write() fails, as the data read from / written to the EC might be incomplete.
--- drivers/acpi/ec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/acpi/ec.c +4 -1
@@ -1316,10 +1316,13 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,if (ec->busy_polling || bits >8 )acpi_ec_burst_enable (ec); -for (i =0 ; i < bytes; ++i, ++address, ++value) +for (i =0 ; i < bytes; ++i, ++address, ++value) { result = (function ==ACPI_READ ) ?acpi_ec_read (ec, address, value) :acpi_ec_write (ec, address, *value); +if (result <0 ) +break ; + }if (ec->busy_polling || bits >8 )acpi_ec_burst_disable (ec);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 3/13 ACPI: EC: Avoid returning AE_OK on errors in address space handler
In reply to Sasha LevinFrom: Armin Wolf <[email protected]>
[ Upstream commit c4bd7f1d78340e63de4d073fd3dbe5391e2996e5 ]
If an error code other than EINVAL, ENODEV or ETIME is returned by acpi_ec_read() / acpi_ec_write(), then AE_OK is incorrectly returned by acpi_ec_space_handler().
Fix this by only returning AE_OK on success, and return AE_ERROR otherwise.
--- drivers/acpi/ec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/acpi/ec.c +3 -1
@@ -1334,8 +1334,10 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,return AE_NOT_FOUND ;case -ETIME :return AE_TIME ; -default : +case 0 :return AE_OK ; +default : +return AE_ERROR ; } }
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 4/13 wifi: mac80211: mesh: init nonpeer_pm to active by default in mesh sdata
In reply to Sasha LevinFrom: Nicolas Escande <[email protected]>
[ Upstream commit 6f6291f09a322c1c1578badac8072d049363f4e6 ]
With a ath9k device I can see that:
iw phy phy0 interface add mesh0 type mp
ip link set mesh0 up
iw dev mesh0 scan
Will start a scan with the Power Management bit set in the Frame Control Field. This is because we set this bit depending on the nonpeer_pm variable of the mesh iface sdata and when there are no active links on the interface it remains to NL80211_MESH_POWER_UNKNOWN.
As soon as links starts to be established, it wil switch to NL80211_MESH_POWER_ACTIVE as it is the value set by befault on the per sta nonpeer_pm field.
As we want no power save by default, (as expressed with the per sta ini values), lets init it to the expected default value of NL80211_MESH_POWER_ACTIVE.
Also please note that we cannot change the default value from userspace prior to establishing a link as using NL80211_CMD_SET_MESH_CONFIG will not work before NL80211_CMD_JOIN_MESH has been issued. So too late for our initial scan.
--- net/mac80211/mesh.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/mesh.c +1 -0
@@ -1584,6 +1584,7 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) ifmsh->last_preq = jiffies; ifmsh->next_perr = jiffies; ifmsh->csa_role =IEEE80211_MESH_CSA_ROLE_NONE ; + ifmsh->nonpeer_pm =NL80211_MESH_POWER_ACTIVE ;/* Allocate all mesh structures when creating the first mesh interface. */ if (!mesh_allocated)ieee80211s_init ();
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 5/13 wifi: mac80211: fix UBSAN noise in ieee80211_prep_hw_scan()
In reply to Sasha LevinFrom: Dmitry Antipov <[email protected]>
[ Upstream commit 92ecbb3ac6f3fe8ae9edf3226c76aa17b6800699 ]
When testing the previous patch with CONFIG_UBSAN_BOUNDS, I've noticed the following:
UBSAN: array-index-out-of-bounds in net/mac80211/scan.c:372:4 index 0 is out of range for type 'struct ieee80211_channel *[]' CPU: 0 PID: 1435 Comm: wpa_supplicant Not tainted 6.9.0+ #1 Hardware name: LENOVO 20UN005QRT/20UN005QRT <...BIOS details...> Call Trace: <TASK> dump_stack_lvl+0x2d/0x90 __ubsan_handle_out_of_bounds+0xe7/0x140 ? timerqueue_add+0x98/0xb0 ieee80211_prep_hw_scan+0x2db/0x480 [mac80211] ? __kmalloc+0xe1/0x470 __ieee80211_start_scan+0x541/0x760 [mac80211] rdev_scan+0x1f/0xe0 [cfg80211] nl80211_trigger_scan+0x9b6/0xae0 [cfg80211] ...<the rest is not too useful...>
Since '__ieee80211_start_scan()' leaves 'hw_scan_req->req.n_channels' uninitialized, actual boundaries of 'hw_scan_req->req.channels' can't be checked in 'ieee80211_prep_hw_scan()'. Although an initialization of 'hw_scan_req->req.n_channels' introduces some confusion around allocated vs. used VLA members, this shouldn't be a problem since everything is correctly adjusted soon in 'ieee80211_prep_hw_scan()'.
Cleanup 'kmalloc()' math in '__ieee80211_start_scan()' by using the convenient 'struct_size()' as well.
--- net/mac80211/scan.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/mac80211/scan.c +10 -4
@@ -727,15 +727,21 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata, local->hw_scan_ies_bufsize *= n_bands; } - local->hw_scan_req =kmalloc ( -sizeof (*local->hw_scan_req) + - req->n_channels *sizeof (req->channels[0 ]) + - local->hw_scan_ies_bufsize,GFP_KERNEL ); + local->hw_scan_req =kmalloc (struct_size (local->hw_scan_req, + req.channels, + req->n_channels) + + local->hw_scan_ies_bufsize, +GFP_KERNEL );if (!local->hw_scan_req)return -ENOMEM ; local->hw_scan_req->req.ssids = req->ssids; local->hw_scan_req->req.n_ssids = req->n_ssids; +/* None of the channels are actually set +* up but let UBSAN know the boundaries. +*/ + local->hw_scan_req->req.n_channels = req->n_channels; + ies = (u8 *)local->hw_scan_req +sizeof (*local->hw_scan_req) + req->n_channels *sizeof (req->channels[0 ]);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 6/13 selftests/openat2: Fix build warnings on ppc64
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 84b6df4c49a1cc2854a16937acd5fd3e6315d083 ]
Fix warnings like:
openat2_test.c: In function ‘test_openat2_flags’:
openat2_test.c:303:73: warning: format ‘%llX’ expects argument of type ‘long long unsigned int’, but argument 5 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=]
By switching to unsigned long long for u64 for ppc64 builds.
--- tools/testing/selftests/openat2/openat2_test.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/openat2/openat2_test.c +1 -0
@@ -5,6 +5,7 @@*/ #define _GNU_SOURCE +#define __SANE_USERSPACE_TYPES__// Use ll64 #include <fcntl.h> #include <sched.h> #include <sys/stat.h>
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 7/13 Input: silead - Always support 10 fingers
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 38a38f5a36da9820680d413972cb733349400532 ]
When support for Silead touchscreens was orginal added some touchscreens with older firmware versions only supported 5 fingers and this was made the default requiring the setting of a "silead,max-fingers=10" uint32 device-property for all touchscreen models which do support 10 fingers.
There are very few models with the old 5 finger fw, so in practice the setting of the "silead,max-fingers=10" is boilerplate which needs to be copy and pasted to every touchscreen config.
Reporting that 10 fingers are supported on devices which only support 5 fingers doesn't cause any problems for userspace in practice, since at max 4 finger gestures are supported anyways. Drop the max_fingers configuration and simply always assume 10 fingers.
--- drivers/input/touchscreen/silead.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/input/touchscreen/silead.c +5 -14
@@ -70,7 +70,6 @@ struct silead_ts_data {struct regulator_bulk_data regulators[2 ];char fw_name[64 ];struct touchscreen_properties prop; -u32 max_fingers;u32 chip_id;struct input_mt_pos pos[SILEAD_MAX_FINGERS ];int slots[SILEAD_MAX_FINGERS ];
@@ -98,7 +97,7 @@ static int silead_ts_request_input_dev(struct silead_ts_data *data)input_set_abs_params (data->input,ABS_MT_POSITION_Y ,0 ,4095 ,0 ,0 );touchscreen_parse_properties (data->input, true, &data->prop); -input_mt_init_slots (data->input, data->max_fingers, +input_mt_init_slots (data->input,SILEAD_MAX_FINGERS ,INPUT_MT_DIRECT |INPUT_MT_DROP_UNUSED |INPUT_MT_TRACK );
@@ -145,10 +144,10 @@ static void silead_ts_read_data(struct i2c_client *client)return ; } -if (buf[0 ] > data->max_fingers) { +if (buf[0 ] >SILEAD_MAX_FINGERS ) {dev_warn (dev,"More touches reported then supported %d > %d\n" , - buf[0 ], data->max_fingers); - buf[0 ] = data->max_fingers; + buf[0 ],SILEAD_MAX_FINGERS ); + buf[0 ] =SILEAD_MAX_FINGERS ; } touch_nr =0 ;
@@ -200,7 +199,6 @@ static void silead_ts_read_data(struct i2c_client *client)static int silead_ts_init (struct i2c_client *client) { -struct silead_ts_data *data =i2c_get_clientdata (client);int error; error = i2c_smbus_write_byte_data(client, SILEAD_REG_RESET,
@@ -210,7 +208,7 @@ static int silead_ts_init(struct i2c_client *client)usleep_range (SILEAD_CMD_SLEEP_MIN ,SILEAD_CMD_SLEEP_MAX ); error =i2c_smbus_write_byte_data (client,SILEAD_REG_TOUCH_NR , - data->max_fingers); +SILEAD_MAX_FINGERS );if (error) goto i2c_write_err;usleep_range (SILEAD_CMD_SLEEP_MIN ,SILEAD_CMD_SLEEP_MAX );
@@ -437,13 +435,6 @@ static void silead_ts_read_props(struct i2c_client *client)const char *str;int error; - error =device_property_read_u32 (dev,"silead,max-fingers" , - &data->max_fingers); -if (error) { -dev_dbg (dev,"Max fingers read error %d\n" , error); - data->max_fingers =5 ;/* Most devices handle up-to 5 fingers */ - } - error =device_property_read_string (dev,"firmware-name" , &str);if (!error) snprintf(data->fw_name, sizeof(data->fw_name),
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 8/13 net: ipv6: rpl_iptunnel: block BH in rpl_output() and rpl_input()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit db0090c6eb12c31246438b7fe2a8f1b833e7a653 ]
As explained in commit 1378817486d6 ("tipc: block BH before using dst_cache"), net/core/dst_cache.c helpers need to be called with BH disabled.
Disabling preemption in rpl_output() is not good enough, because rpl_output() is called from process context, lwtunnel_output() only uses rcu_read_lock().
We might be interrupted by a softirq, re-enter rpl_output() and corrupt dst_cache data structures.
Fix the race by using local_bh_disable() instead of preempt_disable().
Apply a similar change in rpl_input().
--- net/ipv6/rpl_iptunnel.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
net/ipv6/rpl_iptunnel.c +6 -8
@@ -217,9 +217,9 @@ static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb)if (unlikely (err)) goto drop; -preempt_disable (); +local_bh_disable (); dst =dst_cache_get (&rlwt->cache); -preempt_enable (); +local_bh_enable ();if (unlikely (!dst)) {struct ipv6hdr *hdr =ipv6_hdr (skb);
@@ -239,9 +239,9 @@ static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb) goto drop; } -preempt_disable (); +local_bh_disable ();dst_cache_set_ip6 (&rlwt->cache, dst, &fl6.saddr); -preempt_enable (); +local_bh_enable (); }skb_dst_drop (skb);
@@ -273,9 +273,8 @@ static int rpl_input(struct sk_buff *skb)return err; } -preempt_disable (); +local_bh_disable (); dst =dst_cache_get (&rlwt->cache); -preempt_enable ();skb_dst_drop (skb);
@@ -283,14 +282,13 @@ static int rpl_input(struct sk_buff *skb)ip6_route_input (skb); dst =skb_dst (skb);if (!dst->error) { -preempt_disable ();dst_cache_set_ip6 (&rlwt->cache, dst, &ipv6_hdr (skb)->saddr); -preempt_enable (); } }else {skb_dst_set (skb, dst); } +local_bh_enable (); err =skb_cow_head (skb,LL_RESERVED_SPACE (dst->dev));if (unlikely (err))
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 9/13 ila: block BH in ila_output()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit cf28ff8e4c02e1ffa850755288ac954b6ff0db8c ]
As explained in commit 1378817486d6 ("tipc: block BH before using dst_cache"), net/core/dst_cache.c helpers need to be called with BH disabled.
ila_output() is called from lwtunnel_output() possibly from process context, and under rcu_read_lock().
We might be interrupted by a softirq, re-enter ila_output() and corrupt dst_cache data structures.
Fix the race by using local_bh_disable().
--- net/ipv6/ila/ila_lwt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/ipv6/ila/ila_lwt.c +6 -1
@@ -58,7 +58,9 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb)return orig_dst->lwtstate->orig_output (net, sk, skb); } +local_bh_disable (); dst =dst_cache_get (&ilwt->dst_cache); +local_bh_enable ();if (unlikely (!dst)) {struct ipv6hdr *ip6h =ipv6_hdr (skb);struct flowi6 fl6;
@@ -86,8 +88,11 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) goto drop; } -if (ilwt->connected) +if (ilwt->connected) { +local_bh_disable ();dst_cache_set_ip6 (&ilwt->dst_cache, dst, &fl6.saddr); +local_bh_enable (); + } }skb_dst_set (skb, dst);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 10/13 arm64: armv8_deprecated: Fix warning in isndep cpuhp starting process
In reply to Sasha LevinFrom: Wei Li <[email protected]>
[ Upstream commit 14951beaec93696b092a906baa0f29322cf34004 ]
The function run_all_insn_set_hw_mode() is registered as startup callback of 'CPUHP_AP_ARM64_ISNDEP_STARTING', it invokes set_hw_mode() methods of all emulated instructions.
As the STARTING callbacks are not expected to fail, if one of the set_hw_mode() fails, e.g. due to el0 mixed-endian is not supported for 'setend', it will report a warning:
``` CPU[2] cannot support the emulation of setend CPU 2 UP state arm64/isndep:starting (136) failed (-22) CPU2: Booted secondary processor 0x0000000002 [0x414fd0c1] ```
To fix it, add a check for INSN_UNAVAILABLE status and skip the process.
--- arch/arm64/kernel/armv8_deprecated.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/kernel/armv8_deprecated.c +3 -0
@@ -471,6 +471,9 @@ static int run_all_insn_set_hw_mode(unsigned int cpu)for (i =0 ; i <ARRAY_SIZE (insn_emulations); i++) {struct insn_emulation *insn = insn_emulations[i];bool enable =READ_ONCE (insn->current_mode) ==INSN_HW ; +if (insn->status ==INSN_UNAVAILABLE ) +continue ; +if (insn->set_hw_mode && insn->set_hw_mode (enable)) {pr_warn ("CPU[%u] cannot support the emulation of %s" , cpu, insn->name);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 11/13 null_blk: fix validation of block size
In reply to Sasha LevinFrom: Andreas Hindborg <[email protected]>
[ Upstream commit c462ecd659b5fce731f1d592285832fd6ad54053 ]
Block size should be between 512 and PAGE_SIZE and be a power of 2. The current check does not validate this, so update the check.
Without this patch, null_blk would Oops due to a null pointer deref when loaded with bs=1536 [1].
--- drivers/block/null_blk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/null_blk/main.c +2 -2
@@ -1743,8 +1743,8 @@ static int null_validate_conf(struct nullb_device *dev)return -EINVAL ; } - dev->blocksize =round_down (dev->blocksize,512 ); - dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096); +if (blk_validate_block_size (dev->blocksize)) +return -EINVAL ;if (dev->queue_mode ==NULL_Q_MQ && dev->use_per_node_hctx) {if (dev->submit_queues != nr_online_nodes)
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 12/13 kconfig: gconf: give a proper initial state to the Save button
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 46edf4372e336ef3a61c3126e49518099d2e2e6d ]
Currently, the initial state of the "Save" button is always active.
If none of the CONFIG options are changed while loading the .config file, the "Save" button should be greyed out.
This can be fixed by calling conf_read() after widget initialization.
--- scripts/kconfig/gconf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/kconfig/gconf.c +2 -1
@@ -1484,7 +1484,6 @@ int main(int ac, char *av[])conf_parse (name);fixup_rootmenu (&rootmenu); -conf_read (NULL );/* Load the interface and connect signals */ init_main_window (glade_file);
@@ -1492,6 +1491,8 @@ int main(int ac, char *av[])init_left_tree ();init_right_tree (); +conf_read (NULL ); +switch (view_mode) {case SINGLE_VIEW :display_tree_part ();
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 13/13 kconfig: remove wrong expr_trans_bool()
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 77a92660d8fe8d29503fae768d9f5eb529c88b36 ]
expr_trans_bool() performs an incorrect transformation.
[Test Code]
config MODULES
def_bool y
modules
config A
def_bool y
select C if B != n
config B
def_tristate m
config C
tristate[Result]
CONFIG_MODULES=y
CONFIG_A=y
CONFIG_B=m
CONFIG_C=m
This output is incorrect because CONFIG_C=y is expected.
Documentation/kbuild/kconfig-language.rst clearly explains the function of the '!=' operator:
If the values of both symbols are equal, it returns 'n', otherwise 'y'.
Therefore, the statement:
select C if B != n
should be equivalent to:
select C if y
Or, more simply:
select C
Hence, the symbol C should be selected by the value of A, which is 'y'.
However, expr_trans_bool() wrongly transforms it to:
select C if B
Therefore, the symbol C is selected by (A && B), which is 'm'.
The comment block of expr_trans_bool() correctly explains its intention:
* bool FOO!=n => FOO
^^^^
If FOO is bool, FOO!=n can be simplified into FOO. This is correct.
However, the actual code performs this transformation when FOO is tristate:
if (e->left.sym->type == S_TRISTATE) {
^^^^^^^^^^While it can be fixed to S_BOOLEAN, there is no point in doing so because expr_tranform() already transforms FOO!=n to FOO when FOO is bool. (see the "case E_UNEQUAL" part)
expr_trans_bool() is wrong and unnecessary.
--- scripts/kconfig/expr.c | 29 ----------------------------- scripts/kconfig/expr.h | 1 - scripts/kconfig/menu.c | 2 -- 3 files changed, 32 deletions(-)
scripts/kconfig/expr.c +0 -29
@@ -396,35 +396,6 @@ static struct expr *expr_eliminate_yn(struct expr *e)return e; } -/* -* bool FOO!=n => FOO -*/ -struct expr *expr_trans_bool (struct expr *e) -{ -if (!e) -return NULL ; -switch (e->type) { -case E_AND : -case E_OR : -case E_NOT : - e->left.expr =expr_trans_bool (e->left.expr); - e->right.expr =expr_trans_bool (e->right.expr); -break ; -case E_UNEQUAL : -// FOO!=n -> FOO -if (e->left.sym->type ==S_TRISTATE ) { -if (e->right.sym == &symbol_no) { - e->type =E_SYMBOL ; - e->right.sym =NULL ; - } - } -break ; -default : - ; - } -return e; -} -/* * e1 || e2 -> ? */
scripts/kconfig/expr.h +0 -1
@@ -302,7 +302,6 @@ void expr_free(struct expr *e);void expr_eliminate_eq (struct expr **ep1,struct expr **ep2);int expr_eq (struct expr *e1,struct expr *e2);tristate expr_calc_value (struct expr *e); -struct expr *expr_trans_bool (struct expr *e);struct expr *expr_eliminate_dups (struct expr *e);struct expr *expr_transform (struct expr *e);int expr_contains_symbol (struct expr *dep,struct symbol *sym);
scripts/kconfig/menu.c +0 -2
@@ -401,8 +401,6 @@ void menu_finalize(struct menu *parent) dep =expr_transform (dep); dep =expr_alloc_and (expr_copy (basedep), dep); dep =expr_eliminate_dups (dep); -if (menu->sym && menu->sym->type !=S_TRISTATE ) - dep =expr_trans_bool (dep); prop->visible.expr = dep;/*
Signature · 1 line
2.43.0