ice: fix out-of-bounds KASAN warining in virtchnl
Subsystems (2)
PATCH 1/1 ice: fix out-of-bounds KASAN warining in virtchnl
KASAN reported:
[ 9793.708867] BUG: KASAN: global-out-of-bounds in ice_get_link_speed+0x16/0x30 [ice] [ 9793.709205] Read of size 4 at addr ffffffffc1271b1c by task kworker/6:1/402
[ 9793.709222] CPU: 6 PID: 402 Comm: kworker/6:1 Kdump: loaded Tainted: G B OE 6.1.0+ #3 [ 9793.709235] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.00.01.0014.070920180847 07/09/2018 [ 9793.709245] Workqueue: ice ice_service_task [ice] [ 9793.709575] Call Trace: [ 9793.709582] <TASK> [ 9793.709588] dump_stack_lvl+0x44/0x5c [ 9793.709613] print_report+0x17f/0x47b [ 9793.709632] ? __cpuidle_text_end+0x5/0x5 [ 9793.709653] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.709986] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710317] kasan_report+0xb7/0x140 [ 9793.710335] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710673] ice_get_link_speed+0x16/0x30 [ice] [ 9793.711006] ice_vc_notify_vf_link_state+0x14c/0x160 [ice] [ 9793.711351] ? ice_vc_repr_cfg_promiscuous_mode+0x120/0x120 [ice] [ 9793.711698] ice_vc_process_vf_msg+0x7a7/0xc00 [ice] [ 9793.712074] __ice_clean_ctrlq+0x98f/0xd20 [ice] [ 9793.712534] ? ice_bridge_setlink+0x410/0x410 [ice] [ 9793.712979] ? __request_module+0x320/0x520 [ 9793.713014] ? ice_process_vflr_event+0x27/0x130 [ice] [ 9793.713489] ice_service_task+0x11cf/0x1950 [ice] [ 9793.713948] ? io_schedule_timeout+0xb0/0xb0 [ 9793.713972] process_one_work+0x3d0/0x6a0 [ 9793.714003] worker_thread+0x8a/0x610 [ 9793.714031] ? process_one_work+0x6a0/0x6a0 [ 9793.714049] kthread+0x164/0x1a0 [ 9793.714071] ? kthread_complete_and_exit+0x20/0x20 [ 9793.714100] ret_from_fork+0x1f/0x30 [ 9793.714137] </TASK>
[ 9793.714151] The buggy address belongs to the variable: [ 9793.714158] ice_aq_to_link_speed+0x3c/0xffffffffffff3520 [ice]
[ 9793.714632] Memory state around the buggy address: [ 9793.714642] ffffffffc1271a00: f9 f9 f9 f9 00 00 05 f9 f9 f9 f9 f9 00 00 02 f9 [ 9793.714656] ffffffffc1271a80: f9 f9 f9 f9 00 00 04 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714670] >ffffffffc1271b00: 00 00 00 04 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 [ 9793.714680] ^ [ 9793.714690] ffffffffc1271b80: 00 00 00 00 00 04 f9 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714704] ffffffffc1271c00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
The ICE_AQ_LINK_SPEED_UNKNOWN define is BIT(15). The value is bigger than both legacy and normal link speed tables. Add one element (0 - unknown) to both tables. There is no need to explicit set table size, leave it empty.
--- drivers/net/ethernet/intel/ice/ice_common.c | 5 +++-- drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +3 -2
@@ -5562,7 +5562,7 @@ bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw)* returned by the firmware is a 16 bit * value, but is indexed * by [fls(speed) - 1] */ -static const u32 ice_aq_to_link_speed[15 ] = { +static const u32 ice_aq_to_link_speed[] = {SPEED_10 ,/* BIT(0) */ SPEED_100 ,SPEED_1000 ,
@@ -5577,7 +5577,8 @@ static const u32 ice_aq_to_link_speed[15] = {0 ,0 ,0 , - 0 /* BIT(14) */ +0 , + 0 /* BIT(15) */ };/**
drivers/net/ethernet/intel/ice/ice_vf_mbx.c +3 -2
@@ -39,7 +39,7 @@ ice_aq_send_msg_to_vf(struct ice_hw *hw, u16 vfid, u32 v_opcode, u32 v_retval,return ice_sq_send_cmd (hw, &hw->mailboxq, &desc, msg, msglen, cd); } -static const u32 ice_legacy_aq_to_vc_speed[15 ] = { +static const u32 ice_legacy_aq_to_vc_speed[] = {VIRTCHNL_LINK_SPEED_100MB ,/* BIT(0) */ VIRTCHNL_LINK_SPEED_100MB ,VIRTCHNL_LINK_SPEED_1GB ,
@@ -54,7 +54,8 @@ static const u32 ice_legacy_aq_to_vc_speed[15] = {VIRTCHNL_LINK_SPEED_UNKNOWN ,VIRTCHNL_LINK_SPEED_UNKNOWN ,VIRTCHNL_LINK_SPEED_UNKNOWN , - VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(14) */ +VIRTCHNL_LINK_SPEED_UNKNOWN , + VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(15) */ };/**
Signature · 6 lines
2.36.1 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
[CC: +Brett, +Alexander, +Jesse, +Gurucharan]
Dear Michal,
Thank you for your patch.
Am 21.12.22 um 10:27 schrieb Michal Swiatkowski:
In the summary, I normally prefer to not the action. (There is also a typo in *warning*.
Quoted 37 lines
KASAN reported:
[ 9793.708867] BUG: KASAN: global-out-of-bounds in ice_get_link_speed+0x16/0x30 [ice] [ 9793.709205] Read of size 4 at addr ffffffffc1271b1c by task kworker/6:1/402[ 9793.709222] CPU: 6 PID: 402 Comm: kworker/6:1 Kdump: loaded Tainted: G B OE 6.1.0+ #3 [ 9793.709235] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.00.01.0014.070920180847 07/09/2018 [ 9793.709245] Workqueue: ice ice_service_task [ice] [ 9793.709575] Call Trace: [ 9793.709582] <TASK> [ 9793.709588] dump_stack_lvl+0x44/0x5c [ 9793.709613] print_report+0x17f/0x47b [ 9793.709632] ? __cpuidle_text_end+0x5/0x5 [ 9793.709653] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.709986] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710317] kasan_report+0xb7/0x140 [ 9793.710335] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710673] ice_get_link_speed+0x16/0x30 [ice] [ 9793.711006] ice_vc_notify_vf_link_state+0x14c/0x160 [ice] [ 9793.711351] ? ice_vc_repr_cfg_promiscuous_mode+0x120/0x120 [ice] [ 9793.711698] ice_vc_process_vf_msg+0x7a7/0xc00 [ice] [ 9793.712074] __ice_clean_ctrlq+0x98f/0xd20 [ice] [ 9793.712534] ? ice_bridge_setlink+0x410/0x410 [ice] [ 9793.712979] ? __request_module+0x320/0x520 [ 9793.713014] ? ice_process_vflr_event+0x27/0x130 [ice] [ 9793.713489] ice_service_task+0x11cf/0x1950 [ice] [ 9793.713948] ? io_schedule_timeout+0xb0/0xb0 [ 9793.713972] process_one_work+0x3d0/0x6a0 [ 9793.714003] worker_thread+0x8a/0x610 [ 9793.714031] ? process_one_work+0x6a0/0x6a0 [ 9793.714049] kthread+0x164/0x1a0 [ 9793.714071] ? kthread_complete_and_exit+0x20/0x20 [ 9793.714100] ret_from_fork+0x1f/0x30 [ 9793.714137] </TASK>[ 9793.714151] The buggy address belongs to the variable: [ 9793.714158] ice_aq_to_link_speed+0x3c/0xffffffffffff3520 [ice]
Quoted 7 lines
[ 9793.714632] Memory state around the buggy address: [ 9793.714642] ffffffffc1271a00: f9 f9 f9 f9 00 00 05 f9 f9 f9 f9 f9 00 00 02 f9 [ 9793.714656] ffffffffc1271a80: f9 f9 f9 f9 00 00 04 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714670] >ffffffffc1271b00: 00 00 00 04 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 [ 9793.714680] ^ [ 9793.714690] ffffffffc1271b80: 00 00 00 00 00 04 f9 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714704] ffffffffc1271c00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Do you need to do something special to trigger this? I am curious, why this wasn’t found, when it has a Tested-by tag.
Quoted 3 lines
The
ICE_AQ_LINK_SPEED_UNKNOWNdefine is BIT(15). The value is bigger than both legacy and normal link speed tables. Add one element (0 - unknown) to both tables. There is no need to explicit set table size,
explicit*ly*?
Quoted 3 lines
leave it empty.
Fixes 1d0e28a9be1f ("ice: Remove and replace ice speed defines with ethtool.h versions")
This is in next-20221202. (Can commits in linux-next be amended? Probably not.)
Quoted 43 lines
Signed-off-by Michal Swiatkowski <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 5 +++-- drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_common.c +3
-2@@ -5562,7 +5562,7 @@ bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw)* returned by the firmware is a 16 bit * value, but is indexed * by [fls(speed) - 1] */ -static const u32 ice_aq_to_link_speed[15 ] = { +static const u32 ice_aq_to_link_speed[] = {SPEED_10 ,/* BIT(0) */ SPEED_100 ,SPEED_1000 ,@@ -5577,7 +5577,8 @@ static const u32 ice_aq_to_link_speed[15] = {0 ,0 ,0 , - 0 /* BIT(14) */ +0 , + 0 /* BIT(15) */ };/** drivers/net/ethernet/intel/ice/ice_vf_mbx.c +1
-1@@ -39,7 +39,7 @@ ice_aq_send_msg_to_vf(struct ice_hw *hw, u16 vfid, u32 v_opcode, u32 v_retval,return ice_sq_send_cmd (hw, &hw->mailboxq, &desc, msg, msglen, cd); } -static const u32 ice_legacy_aq_to_vc_speed[15 ] = { +static const u32 ice_legacy_aq_to_vc_speed[] = {VIRTCHNL_LINK_SPEED_100MB ,/* BIT(0) */ VIRTCHNL_LINK_SPEED_100MB ,VIRTCHNL_LINK_SPEED_1GB ,
drivers/net/ethernet/intel/ice/ice_vf_mbx.c static const u32 ice_legacy_aq_to_vc_speed[15] = { · line 61
Quoted 9 lines
drivers/net/ethernet/intel/ice/ice_vf_mbx.c +2
-1@@ -54,7 +54,8 @@ static const u32 ice_legacy_aq_to_vc_speed[15] = {VIRTCHNL_LINK_SPEED_UNKNOWN ,VIRTCHNL_LINK_SPEED_UNKNOWN ,VIRTCHNL_LINK_SPEED_UNKNOWN , - VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(14) */ +VIRTCHNL_LINK_SPEED_UNKNOWN , + VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(15) */ };/**
The rest looks good.
Kind regards,
Paul
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
[Cc: -Brett as host mga04.intel.com[192.55.52.120] said: 550 #5.1.0 Address rejected., +Alexander, +Gurucharan for real]
Am 21.12.22 um 16:37 schrieb Paul Menzel:
Quoted 126 lines
[CC: +Brett, +Alexander, +Jesse, +Gurucharan]
Dear Michal,
Thank you for your patch.
Am 21.12.22 um 10:27 schrieb Michal Swiatkowski:
In the summary, I normally prefer to not the action. (There is also a typo in *warning*.
Quoted 37 lines
KASAN reported:
[ 9793.708867] BUG: KASAN: global-out-of-bounds in ice_get_link_speed+0x16/0x30 [ice] [ 9793.709205] Read of size 4 at addr ffffffffc1271b1c by task kworker/6:1/402[ 9793.709222] CPU: 6 PID: 402 Comm: kworker/6:1 Kdump: loaded Tainted: G B OE 6.1.0+ #3 [ 9793.709235] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.00.01.0014.070920180847 07/09/2018 [ 9793.709245] Workqueue: ice ice_service_task [ice] [ 9793.709575] Call Trace: [ 9793.709582] <TASK> [ 9793.709588] dump_stack_lvl+0x44/0x5c [ 9793.709613] print_report+0x17f/0x47b [ 9793.709632] ? __cpuidle_text_end+0x5/0x5 [ 9793.709653] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.709986] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710317] kasan_report+0xb7/0x140 [ 9793.710335] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710673] ice_get_link_speed+0x16/0x30 [ice] [ 9793.711006] ice_vc_notify_vf_link_state+0x14c/0x160 [ice] [ 9793.711351] ? ice_vc_repr_cfg_promiscuous_mode+0x120/0x120 [ice] [ 9793.711698] ice_vc_process_vf_msg+0x7a7/0xc00 [ice] [ 9793.712074] __ice_clean_ctrlq+0x98f/0xd20 [ice] [ 9793.712534] ? ice_bridge_setlink+0x410/0x410 [ice] [ 9793.712979] ? __request_module+0x320/0x520 [ 9793.713014] ? ice_process_vflr_event+0x27/0x130 [ice] [ 9793.713489] ice_service_task+0x11cf/0x1950 [ice] [ 9793.713948] ? io_schedule_timeout+0xb0/0xb0 [ 9793.713972] process_one_work+0x3d0/0x6a0 [ 9793.714003] worker_thread+0x8a/0x610 [ 9793.714031] ? process_one_work+0x6a0/0x6a0 [ 9793.714049] kthread+0x164/0x1a0 [ 9793.714071] ? kthread_complete_and_exit+0x20/0x20 [ 9793.714100] ret_from_fork+0x1f/0x30 [ 9793.714137] </TASK>[ 9793.714151] The buggy address belongs to the variable: [ 9793.714158] ice_aq_to_link_speed+0x3c/0xffffffffffff3520 [ice]Quoted 7 lines
[ 9793.714632] Memory state around the buggy address: [ 9793.714642] ffffffffc1271a00: f9 f9 f9 f9 00 00 05 f9 f9 f9 f9 f9 00 00 02 f9 [ 9793.714656] ffffffffc1271a80: f9 f9 f9 f9 00 00 04 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714670] >ffffffffc1271b00: 00 00 00 04 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 [ 9793.714680] ^ [ 9793.714690] ffffffffc1271b80: 00 00 00 00 00 04 f9 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714704] ffffffffc1271c00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00Do you need to do something special to trigger this? I am curious, why this wasn’t found, when it has a
Tested-bytag.Quoted 3 lines
The
ICE_AQ_LINK_SPEED_UNKNOWNdefine is BIT(15). The value is bigger than both legacy and normal link speed tables. Add one element (0 - unknown) to both tables. There is no need to explicit set table size,explicit*ly*?
Quoted 3 lines
leave it empty.
Fixes 1d0e28a9be1f ("ice: Remove and replace ice speed defines with ethtool.h versions")This is in next-20221202. (Can commits in linux-next be amended? Probably not.)
Quoted 43 lines
Signed-off-by Michal Swiatkowski <[email protected]>---
drivers/net/ethernet/intel/ice/ice_common.c| 5 +++--drivers/net/ethernet/intel/ice/ice_vf_mbx.c| 5 +++--2 files changed, 6 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_common.c +1
-1@@ -5562,7 +5562,7 @@ bool ice_fw_supports_report_dflt_cfg(structice_hw *hw) * returned by the firmware is a 16 bit * value, but is indexed * by [fls(speed) - 1] */ -static const u32 ice_aq_to_link_speed[15 ] = { +static const u32 ice_aq_to_link_speed[] = {SPEED_10, /* BIT(0) */
SPEED_100,
SPEED_1000,drivers/net/ethernet/intel/ice/ice_common.c +2
-1@@ -5577,7 +5577,8 @@ static const u32 ice_aq_to_link_speed[15] = { 0, 0, 0, - 0 /* BIT(14) */ + 0, + 0 /* BIT(15) */ }; /**drivers/net/ethernet/intel/ice/ice_vf_mbx.c +1
-1@@ -39,7 +39,7 @@ ice_aq_send_msg_to_vf(struct ice_hw *hw, u16 vfid, u32 v_opcode, u32 v_retval, return ice_sq_send_cmd(hw, &hw->mailboxq, &desc, msg, msglen, cd); } -static const u32 ice_legacy_aq_to_vc_speed[15 ] = { +static const u32 ice_legacy_aq_to_vc_speed[] = {VIRTCHNL_LINK_SPEED_100MB, /* BIT(0) */
VIRTCHNL_LINK_SPEED_100MB,
VIRTCHNL_LINK_SPEED_1GB,drivers/net/ethernet/intel/ice/ice_vf_mbx.c static const u32 ice_legacy_aq_to_vc_speed[15] = { · line 60
Quoted 8 lines
drivers/net/ethernet/intel/ice/ice_vf_mbx.c +2
-1@@ -54,7 +54,8 @@ static const u32 ice_legacy_aq_to_vc_speed[15] = { VIRTCHNL_LINK_SPEED_UNKNOWN, VIRTCHNL_LINK_SPEED_UNKNOWN, VIRTCHNL_LINK_SPEED_UNKNOWN, - VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(14) */ + VIRTCHNL_LINK_SPEED_UNKNOWN, + VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(15) */ }; /**The rest looks good.
Quoted 3 lines
Kind regards,
Paul
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Quoted 58 lines · Paul Menzel
[CC: +Brett, +Alexander, +Jesse, +Gurucharan]
Dear Michal,
Thank you for your patch.
Am 21.12.22 um 10:27 schrieb Michal Swiatkowski:
In the summary, I normally prefer to not the action. (There is also a typo in *warning*.
Quoted 37 lines
KASAN reported:
[ 9793.708867] BUG: KASAN: global-out-of-bounds in ice_get_link_speed+0x16/0x30 [ice] [ 9793.709205] Read of size 4 at addr ffffffffc1271b1c by task kworker/6:1/402[ 9793.709222] CPU: 6 PID: 402 Comm: kworker/6:1 Kdump: loaded Tainted: G B OE 6.1.0+ #3 [ 9793.709235] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.00.01.0014.070920180847 07/09/2018 [ 9793.709245] Workqueue: ice ice_service_task [ice] [ 9793.709575] Call Trace: [ 9793.709582] <TASK> [ 9793.709588] dump_stack_lvl+0x44/0x5c [ 9793.709613] print_report+0x17f/0x47b [ 9793.709632] ? __cpuidle_text_end+0x5/0x5 [ 9793.709653] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.709986] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710317] kasan_report+0xb7/0x140 [ 9793.710335] ? ice_get_link_speed+0x16/0x30 [ice] [ 9793.710673] ice_get_link_speed+0x16/0x30 [ice] [ 9793.711006] ice_vc_notify_vf_link_state+0x14c/0x160 [ice] [ 9793.711351] ? ice_vc_repr_cfg_promiscuous_mode+0x120/0x120 [ice] [ 9793.711698] ice_vc_process_vf_msg+0x7a7/0xc00 [ice] [ 9793.712074] __ice_clean_ctrlq+0x98f/0xd20 [ice] [ 9793.712534] ? ice_bridge_setlink+0x410/0x410 [ice] [ 9793.712979] ? __request_module+0x320/0x520 [ 9793.713014] ? ice_process_vflr_event+0x27/0x130 [ice] [ 9793.713489] ice_service_task+0x11cf/0x1950 [ice] [ 9793.713948] ? io_schedule_timeout+0xb0/0xb0 [ 9793.713972] process_one_work+0x3d0/0x6a0 [ 9793.714003] worker_thread+0x8a/0x610 [ 9793.714031] ? process_one_work+0x6a0/0x6a0 [ 9793.714049] kthread+0x164/0x1a0 [ 9793.714071] ? kthread_complete_and_exit+0x20/0x20 [ 9793.714100] ret_from_fork+0x1f/0x30 [ 9793.714137] </TASK>[ 9793.714151] The buggy address belongs to the variable: [ 9793.714158] ice_aq_to_link_speed+0x3c/0xffffffffffff3520 [ice]Quoted 7 lines
[ 9793.714632] Memory state around the buggy address: [ 9793.714642] ffffffffc1271a00: f9 f9 f9 f9 00 00 05 f9 f9 f9 f9 f9 00 00 02 f9 [ 9793.714656] ffffffffc1271a80: f9 f9 f9 f9 00 00 04 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714670] >ffffffffc1271b00: 00 00 00 04 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 [ 9793.714680] ^ [ 9793.714690] ffffffffc1271b80: 00 00 00 00 00 04 f9 f9 f9 f9 f9 f9 00 00 00 00 [ 9793.714704] ffffffffc1271c00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Quoted 3 lines
Do you need to do something special to trigger this? I am curious, why this wasn’t found, when it has a
Tested-bytag.
Only create VFs ex.
# echo 4 > /sys/bus/pci/devices/0000\:18\:00.0/sriov_numvfs
I don't know why it wasn't found, I was checking sth else with KASAN and saw it.
Quoted 6 lines
Quoted 3 lines
The
ICE_AQ_LINK_SPEED_UNKNOWNdefine is BIT(15). The value is bigger than both legacy and normal link speed tables. Add one element (0 - unknown) to both tables. There is no need to explicit set table size,explicit*ly*?
Yeah, thanks
Quoted 7 lines
Quoted 3 lines
leave it empty.
Fixes 1d0e28a9be1f ("ice: Remove and replace ice speed defines with ethtool.h versions")This is in next-20221202. (Can commits in linux-next be amended? Probably not.)
Maybe I copied it wrong, will fix.
Quoted 43 lines
Quoted 43 lines
Signed-off-by Michal Swiatkowski <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 5 +++-- drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_common.c +3
-2@@ -5562,7 +5562,7 @@ bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw)* returned by the firmware is a 16 bit * value, but is indexed * by [fls(speed) - 1] */ -static const u32 ice_aq_to_link_speed[15 ] = { +static const u32 ice_aq_to_link_speed[] = {SPEED_10 ,/* BIT(0) */ SPEED_100 ,SPEED_1000 ,@@ -5577,7 +5577,8 @@ static const u32 ice_aq_to_link_speed[15] = {0 ,0 ,0 , - 0 /* BIT(14) */ +0 , + 0 /* BIT(15) */ };/** drivers/net/ethernet/intel/ice/ice_vf_mbx.c +1
-1@@ -39,7 +39,7 @@ ice_aq_send_msg_to_vf(struct ice_hw *hw, u16 vfid, u32 v_opcode, u32 v_retval,return ice_sq_send_cmd (hw, &hw->mailboxq, &desc, msg, msglen, cd); } -static const u32 ice_legacy_aq_to_vc_speed[15 ] = { +static const u32 ice_legacy_aq_to_vc_speed[] = {VIRTCHNL_LINK_SPEED_100MB ,/* BIT(0) */ VIRTCHNL_LINK_SPEED_100MB ,VIRTCHNL_LINK_SPEED_1GB ,@@ -54,7 +54,8 @@ static const u32 ice_legacy_aq_to_vc_speed[15] = {VIRTCHNL_LINK_SPEED_UNKNOWN , VIRTCHNL_LINK_SPEED_UNKNOWN,
Quoted 8 lines
drivers/net/ethernet/intel/ice/ice_vf_mbx.c static const u32 ice_legacy_aq_to_vc_speed[15] = { · line 61
Quoted 6 lines
drivers/net/ethernet/intel/ice/ice_vf_mbx.c +2
-1VIRTCHNL_LINK_SPEED_UNKNOWN , - VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(14) */ +VIRTCHNL_LINK_SPEED_UNKNOWN , + VIRTCHNL_LINK_SPEED_UNKNOWN /* BIT(15) */ };/** The rest looks good.
Thanks for Your review
Quoted 4 lines
Kind regards,
Paul
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
From: Michal Swiatkowski <[email protected]>
Date: Wed, 21 Dec 2022 10:27:46 +0100
Quoted 7 lines
KASAN reported:
[ 9793.708867] BUG: KASAN: global-out-of-bounds in ice_get_link_speed+0x16/0x30 [ice] [ 9793.709205] Read of size 4 at addr ffffffffc1271b1c by task kworker/6:1/402[ 9793.709222] CPU: 6 PID: 402 Comm: kworker/6:1 Kdump: loaded Tainted: G B OE 6.1.0+ #3 [ 9793.709235] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.00.01.0014.070920180847 07/09/2018 [ 9793.709245] Workqueue: ice ice_service_task [ice]
[...]
Quoted 14 lines
drivers/net/ethernet/intel/ice/ice_common.c +1
-1@@ -5562,7 +5562,7 @@ bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw)* returned by the firmware is a 16 bit * value, but is indexed * by [fls(speed) - 1] */ -static const u32 ice_aq_to_link_speed[15 ] = { +static const u32 ice_aq_to_link_speed[] = {SPEED_10 ,/* BIT(0) */ SPEED_100 ,SPEED_1000 ,
drivers/net/ethernet/intel/ice/ice_common.c static const u32 ice_aq_to_link_speed[15] = { · line 5582
Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_common.c +2
-1@@ -5577,7 +5577,8 @@ static const u32 ice_aq_to_link_speed[15] = {0 ,0 ,0 , - 0 /* BIT(14) */ +0 , + 0 /* BIT(15) */ };
I warned Jesse that no index check might cause out-of-bounds walks and here they are. I suggested the following back then:
1) Don't define any zeroed elements and elements with %VIRTCHNL_LINK_SPEED_UNKNOWN. Don't define explicit array bounds.
2) In ice_get_link_speed():
if (index >= ARRAY_SIZE(ice_aq_to_link_speed)) return 0; return ice_aq_to_link_speed[index];
3) Same in ice_conv_link_speed_to_virtchnl():
u32 index = fls(link_speed) - 1; if (adv_link_support) return ice_get_link_speed(index); else if (index < ARRAY_SIZE(ice_legacy_aq_to_vc_speed)) return ice_legacy_aq_to_vc_speed[index]; else return VIRTCHNL_LINK_SPEED_UNKNOWN;
This could go as a fix to net with no problems.
Quoted 6 lines
drivers/net/ethernet/intel/ice/ice_common.c +0
-0/** drivers/net/ethernet/intel/ice/ice_vf_mbx.c +0
-0
[...]
Quoted 2 lines
Signature · 1 line
2.36.1
Thanks,
Olek
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Quoted 59 lines · Alexander Lobakin
From: Michal Swiatkowski <[email protected]>
Date: Wed, 21 Dec 2022 10:27:46 +0100Quoted 7 lines
KASAN reported:
[ 9793.708867] BUG: KASAN: global-out-of-bounds in ice_get_link_speed+0x16/0x30 [ice] [ 9793.709205] Read of size 4 at addr ffffffffc1271b1c by task kworker/6:1/402[ 9793.709222] CPU: 6 PID: 402 Comm: kworker/6:1 Kdump: loaded Tainted: G B OE 6.1.0+ #3 [ 9793.709235] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.00.01.0014.070920180847 07/09/2018 [ 9793.709245] Workqueue: ice ice_service_task [ice][...]
Quoted 14 lines
drivers/net/ethernet/intel/ice/ice_common.c +1
-1@@ -5562,7 +5562,7 @@ bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw)* returned by the firmware is a 16 bit * value, but is indexed * by [fls(speed) - 1] */ -static const u32 ice_aq_to_link_speed[15 ] = { +static const u32 ice_aq_to_link_speed[] = {SPEED_10 ,/* BIT(0) */ SPEED_100 ,SPEED_1000 ,drivers/net/ethernet/intel/ice/ice_common.c static const u32 ice_aq_to_link_speed[15] = { · line 5582
Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_common.c +2
-1@@ -5577,7 +5577,8 @@ static const u32 ice_aq_to_link_speed[15] = {0 ,0 ,0 , - 0 /* BIT(14) */ +0 , + 0 /* BIT(15) */ };I warned Jesse that no index check might cause out-of-bounds walks and here they are. I suggested the following back then:
1) Don't define any zeroed elements and elements with %VIRTCHNL_LINK_SPEED_UNKNOWN. Don't define explicit array bounds.
2) In
ice_get_link_speed():if (index >= ARRAY_SIZE(ice_aq_to_link_speed)) return 0; return ice_aq_to_link_speed[index];3) Same in
ice_conv_link_speed_to_virtchnl():u32 index = fls(link_speed) - 1; if (adv_link_support) return ice_get_link_speed(index); else if (index < ARRAY_SIZE(ice_legacy_aq_to_vc_speed)) return ice_legacy_aq_to_vc_speed[index]; else return VIRTCHNL_LINK_SPEED_UNKNOWN;
Quoted 2 lines
This could go as a fix to net with no problems.
Sounds reasonable, I will do it in next version, thanks.
Quoted 9 lines
Quoted 6 lines
drivers/net/ethernet/intel/ice/ice_common.c +0
-0/** drivers/net/ethernet/intel/ice/ice_vf_mbx.c +0
-0[...]
Quoted 5 lines
Quoted 2 lines
Signature · 1 line
2.36.1Thanks,
Olek
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan