drm/dp: Remove common Post Cursor2 register handling
PATCH 1/1 drm/dp: Remove common Post Cursor2 register handling
The link_status array was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]
59 | return link_status[r - DP_LANE0_1_STATUS];
| ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status'
147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE],
| ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Replace the only user of the helper with an open-coded fetch and decode, similar to drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.
---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/
--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +0 -10
@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )
drivers/gpu/drm/tegra/dp.c +10 -1
@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor)); +if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =
@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }
include/drm/drm_dp_helper.h +0 -2
@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xf
Signature · 1 line
2.30.2
Quoted 58 lines · Kees Cook
The
link_statusarray was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]59 | return link_status[r - DP_LANE0_1_STATUS]; | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status' 147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Replace the only user of the helper with an open-coded fetch and decode, similar to
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.Fixes 79465e0ffeb9 ("drm/dp: Add helper to get post-cursor adjustments")Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Kees Cook <[email protected]>---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-10@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )drivers/gpu/drm/tegra/dp.c +0
-0
drivers/gpu/drm/tegra/dp.c static void drm_dp_link_get_adjustments(struct drm_dp_link *link, · line 556
Quoted 8 lines
drivers/gpu/drm/tegra/dp.c +5
-0@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor));
There's a drm_dp_dpcd_readb() for the common 1-byte reads. Other than that,
Though obviously that's not enough to actually merge to tegra.
Quoted 29 lines
drivers/gpu/drm/tegra/dp.c +5
-1+if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }include/drm/drm_dp_helper.h +0
-2@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xf
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 71 lines · Jani Nikula
Quoted 58 lines · Kees Cook
The
link_statusarray was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]59 | return link_status[r - DP_LANE0_1_STATUS]; | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status' 147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Replace the only user of the helper with an open-coded fetch and decode, similar to
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.Fixes 79465e0ffeb9 ("drm/dp: Add helper to get post-cursor adjustments")Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Kees Cook <[email protected]>---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-10@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )drivers/gpu/drm/tegra/dp.c +0
-0drivers/gpu/drm/tegra/dp.c static void drm_dp_link_get_adjustments(struct drm_dp_link *link, · line 556
Quoted 8 lines
drivers/gpu/drm/tegra/dp.c +5
-0@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor));There's a
drm_dp_dpcd_readb()for the common 1-byte reads. Other than that,
Quoted 1 line
Reviewed-by Jani Nikula <[email protected]>
Thanks!
Quoted 2 lines
Though obviously that's not enough to actually merge to tegra.
As in, "a review by Jani isn't sufficient to land via the tegra tree"?
What should next steps be?
-Kees
Quoted 33 lines
Quoted 30 lines
drivers/gpu/drm/tegra/dp.c +5
-1+if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }include/drm/drm_dp_helper.h +0
-2@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xfSignature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 1 line
Kees Cook
Quoted 72 lines · Kees Cook
Quoted 71 lines · Jani Nikula
Quoted 58 lines · Kees Cook
The
link_statusarray was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]59 | return link_status[r - DP_LANE0_1_STATUS]; | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status' 147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Replace the only user of the helper with an open-coded fetch and decode, similar to
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.Fixes 79465e0ffeb9 ("drm/dp: Add helper to get post-cursor adjustments")Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Kees Cook <[email protected]>---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-10@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )drivers/gpu/drm/tegra/dp.c +0
-0drivers/gpu/drm/tegra/dp.c static void drm_dp_link_get_adjustments(struct drm_dp_link *link, · line 556
Quoted 8 lines
drivers/gpu/drm/tegra/dp.c +5
-0@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor));There's a
drm_dp_dpcd_readb()for the common 1-byte reads. Other than that,
Quoted 8 lines
Quoted 1 line
Reviewed-by Jani Nikula <[email protected]>Thanks!
Quoted 2 lines
Though obviously that's not enough to actually merge to tegra.
As in, "a review by Jani isn't sufficient to land via the tegra tree"?
Yeah. Or, in this case, via any tree, really.
Quoted 1 line
What should next steps be?
Get an ack from tegra and/or drm-misc maintainers. All the relevant folks and lists are in the recipients already.
BR,
Jani.
Quoted 36 lines
-Kees
Quoted 33 lines
Quoted 30 lines
drivers/gpu/drm/tegra/dp.c +5
-1+if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }include/drm/drm_dp_helper.h +0
-2@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xfSignature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 12 lines · Kees Cook
The
link_statusarray was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]59 | return link_status[r - DP_LANE0_1_STATUS]; | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status' 147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 4 lines
Replace the only user of the helper with an open-coded fetch and decode, similar to
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.Fixes 79465e0ffeb9 ("drm/dp: Add helper to get post-cursor adjustments")
This should be tagged for -stable:
Quoted 7 lines
Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
--
Gustavo
Quoted 73 lines
---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-10@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )drivers/gpu/drm/tegra/dp.c +10
-1@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor)); +if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }include/drm/drm_dp_helper.h +0
-2@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xf
Quoted 15 lines · Gustavo A. R. Silva
Quoted 12 lines · Kees Cook
The
link_statusarray was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]59 | return link_status[r - DP_LANE0_1_STATUS]; | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status' 147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 8 lines
Quoted 4 lines
Replace the only user of the helper with an open-coded fetch and decode, similar to
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.Fixes 79465e0ffeb9 ("drm/dp: Add helper to get post-cursor adjustments")This should be tagged for -stable:
Ah yeah, good point. Added.
Quoted 10 lines
Quoted 8 lines
Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Kees Cook <[email protected]>Reviewed-by Gustavo A. R. Silva <[email protected]>
Thanks!
-Kees
Quoted 78 lines
Thanks
--
GustavoQuoted 73 lines
---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-10@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )drivers/gpu/drm/tegra/dp.c +10
-1@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor)); +if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }include/drm/drm_dp_helper.h +0
-2@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xf
Signature · 1 line
Kees Cook
Ping,
This is a OOB read fix. Can someone please pick this up?
-Kees
Quoted 98 lines · Kees Cook
The
link_statusarray was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]59 | return link_status[r - DP_LANE0_1_STATUS]; | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status' 147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Replace the only user of the helper with an open-coded fetch and decode, similar to
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.Fixes 79465e0ffeb9 ("drm/dp: Add helper to get post-cursor adjustments")Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Kees Cook <[email protected]>---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-10@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )drivers/gpu/drm/tegra/dp.c +10
-1@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor)); +if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }include/drm/drm_dp_helper.h +0
-2@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xfSignature · 1 line
2.30.2
Signature · 1 line
Kees Cook
Quoted 3 lines · Kees Cook
Ping,
This is a OOB read fix. Can someone please pick this up?
Daniel? Thierry?
As I said, I reviewed this but I'm not comfortable applying patches that change the functionality of drivers I don't maintain.
BR,
Jani.
Quoted 102 lines
-Kees
Quoted 98 lines · Kees Cook
The
link_statusarray was not large enough to read the Adjust Request Post Cursor2 register, so remove the common helper function to avoid an OOB read, found with a -Warray-bounds build:
drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]59 | return link_status[r - DP_LANE0_1_STATUS]; | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status' 147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE], | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Replace the only user of the helper with an open-coded fetch and decode, similar to
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.Fixes 79465e0ffeb9 ("drm/dp: Add helper to get post-cursor adjustments")Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Kees Cook <[email protected]>---
This is the alternative to:
https://lore.kernel.org/lkml/[email protected]/--- drivers/gpu/drm/drm_dp_helper.c | 10 ---------- drivers/gpu/drm/tegra/dp.c | 11 ++++++++++- include/drm/drm_dp_helper.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-10@@ -144,16 +144,6 @@ u8 drm_dp_get_adjust_tx_ffe_preset(const u8 link_status[DP_LINK_STATUS_SIZE], }EXPORT_SYMBOL (drm_dp_get_adjust_tx_ffe_preset); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane) -{ -unsigned int offset =DP_ADJUST_REQUEST_POST_CURSOR2 ; -u8 value =dp_link_status (link_status, offset); - -return (value >> (lane <<1 )) &0x3 ; -} -EXPORT_SYMBOL (drm_dp_get_adjust_request_post_cursor); -static int __8b10b_clock_recovery_delay_us (const struct drm_dp_aux *aux,u8 rd_interval) {if (rd_interval >4 )drivers/gpu/drm/tegra/dp.c +10
-1@@ -549,6 +549,15 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link, {struct drm_dp_link_train_set *adjust = &link->train.adjust;unsigned int i; +u8 post_cursor; +int err; + + err =drm_dp_dpcd_read (link->aux,DP_ADJUST_REQUEST_POST_CURSOR2 , + &post_cursor,sizeof (post_cursor)); +if (err <0 ) { +DRM_ERROR ("failed to read post_cursor2: %d\n" , err); + post_cursor =0 ; + }for (i =0 ; i < link->lanes; i++) { adjust->voltage_swing[i] =@@ -560,7 +569,7 @@ static void drm_dp_link_get_adjustments(struct drm_dp_link *link,DP_TRAIN_PRE_EMPHASIS_SHIFT ; adjust->post_cursor[i] = -drm_dp_get_adjust_request_post_cursor (status, i); + (post_cursor >> (i <<1 )) &0x3 ; } }include/drm/drm_dp_helper.h +0
-2@@ -1528,8 +1528,6 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI int lane);u8 drm_dp_get_adjust_tx_ffe_preset (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane); -u8 drm_dp_get_adjust_request_post_cursor (const u8 link_status[DP_LINK_STATUS_SIZE ], -unsigned int lane);#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xfSignature · 1 line
2.30.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center