drm/amdgpu/atom: Work around vbios NULL offset false positive
Subsystems (2)
PATCH 1/1 drm/amdgpu/atom: Work around vbios NULL offset false positive
GCC really does not want to consider NULL (or near-NULL) addresses as valid, so calculations based off of NULL end up getting range-tracked into being an offset wthin a 0 byte array. It gets especially mad about this:
if (vbios_str == NULL)
vbios_str += sizeof(BIOS_ATOM_PREFIX) - 1;
...
if (vbios_str != NULL && *vbios_str == 0)
vbios_str++;It sees this as being "sizeof(BIOS_ATOM_PREFIX) - 1" byte offset from NULL, when building with -Warray-bounds (and the coming -fdiagnostic-details flag):
In function 'atom_get_vbios_pn',
inlined from 'amdgpu_atom_parse' at drivers/gpu/drm/amd/amdgpu/atom.c:1553:2:drivers/gpu/drm/amd/amdgpu/atom.c:1447:34: error: array subscript 0 is outside array bounds of 'unsigned char[0]' [-Werror=array-bounds=]
1447 | if (vbios_str != NULL && *vbios_str == 0)
| ^~~~~~~~~~
'amdgpu_atom_parse': events 1-2
1444 | if (vbios_str == NULL)
| ^
| |
| (1) when the condition is evaluated to true
......
1447 | if (vbios_str != NULL && *vbios_str == 0)
| ~~~~~~~~~~
| |
| (2) out of array bounds hereIn function 'amdgpu_atom_parse':
cc1: note: source object is likely at address zero
As there isn't a sane way to convince it otherwise, hide vbios_str from GCC's optimizer to avoid the warning so we can get closer to enabling -Warray-bounds globally.
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: Xinhui Pan <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Simona Vetter <[email protected]>
Cc: Jesse Zhang <[email protected]>
Cc: Tim Huang <[email protected]>
Cc: Srinivasan Shanmugam <[email protected]>
Cc: Alexander Richards <[email protected]>
Cc: Lijo Lazar <[email protected]>
Cc: Mario Limonciello <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/amd/amdgpu/atom.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/atom.c +1 -0
@@ -1444,6 +1444,7 @@ static void atom_get_vbios_pn(struct atom_context *ctx)if (vbios_str ==NULL ) vbios_str +=sizeof (BIOS_ATOM_PREFIX ) -1 ; } +OPTIMIZER_HIDE_VAR (vbios_str);if (vbios_str !=NULL && *vbios_str ==0 ) vbios_str++;
Signature · 1 line
2.34.1
Quoted 30 lines · Kees Cook
GCC really does not want to consider NULL (or near-NULL) addresses as valid, so calculations based off of NULL end up getting range-tracked into being an offset wthin a 0 byte array. It gets especially mad about this:
if (vbios_str == NULL) vbios_str += sizeof(BIOS_ATOM_PREFIX) - 1; ... if (vbios_str != NULL && *vbios_str == 0) vbios_str++;It sees this as being "
sizeof(BIOS_ATOM_PREFIX)- 1" byte offset from NULL, when building with -Warray-bounds (and the coming -fdiagnostic-details flag):In function '
atom_get_vbios_pn',
inlined from 'amdgpu_atom_parse' atdrivers/gpu/drm/amd/amdgpu/atom.c:1553:2:drivers/gpu/drm/amd/amdgpu/atom.c:1447:34: error: array subscript 0 is outside array bounds of 'unsigned char[0]' [-Werror=array-bounds=]
1447 | if (vbios_str!= NULL &&*vbios_str== 0)
| ^~~~~~~~~~
'amdgpu_atom_parse': events 1-21444 | if (vbios_str == NULL) | ^ | | | (1) when the condition is evaluated to true ...... 1447 | if (vbios_str != NULL && *vbios_str == 0) | ~~~~~~~~~~ | | | (2) out of array bounds here
Quoted 8 lines
In function '
amdgpu_atom_parse':
cc1: note: source object is likely at address zeroAs there isn't a sane way to convince it otherwise, hide
vbios_strfrom GCC's optimizer to avoid the warning so we can get closer to enabling -Warray-bounds globally.Signed-off-by Kees Cook <[email protected]>
Do you want me to pick this up, or do you want to take this through some other tree?
Thanks,
Alex
Quoted 34 lines
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: Xinhui Pan <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Simona Vetter <[email protected]>
Cc: Jesse Zhang <[email protected]>
Cc: Tim Huang <[email protected]>
Cc: Srinivasan Shanmugam <[email protected]>
Cc: Alexander Richards <[email protected]>
Cc: Lijo Lazar <[email protected]>
Cc: Mario Limonciello <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/amd/amdgpu/atom.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/amd/amdgpu/atom.c +1
-1@@ -1444,6 +1444,7 @@ static void atom_get_vbios_pn(struct atom_context *ctx)if (vbios_str ==NULL ) vbios_str +=sizeof (BIOS_ATOM_PREFIX ) -1 ; } +OPTIMIZER_HIDE_VAR (vbios_str);if (vbios_str !=NULL && *vbios_str ==0 ) vbios_str++; --2.34.1
Quoted 34 lines · Alex Deucher
Quoted 33 lines · Kees Cook
GCC really does not want to consider NULL (or near-NULL) addresses as valid, so calculations based off of NULL end up getting range-tracked into being an offset wthin a 0 byte array. It gets especially mad about this:
if (vbios_str == NULL) vbios_str += sizeof(BIOS_ATOM_PREFIX) - 1; ... if (vbios_str != NULL && *vbios_str == 0) vbios_str++;It sees this as being "
sizeof(BIOS_ATOM_PREFIX)- 1" byte offset from NULL, when building with -Warray-bounds (and the coming -fdiagnostic-details flag):In function '
atom_get_vbios_pn',
inlined from 'amdgpu_atom_parse' atdrivers/gpu/drm/amd/amdgpu/atom.c:1553:2:drivers/gpu/drm/amd/amdgpu/atom.c:1447:34: error: array subscript 0 is outside array bounds of 'unsigned char[0]' [-Werror=array-bounds=]
1447 | if (vbios_str!= NULL &&*vbios_str== 0)
| ^~~~~~~~~~
'amdgpu_atom_parse': events 1-21444 | if (vbios_str == NULL) | ^ | | | (1) when the condition is evaluated to true ...... 1447 | if (vbios_str != NULL && *vbios_str == 0) | ~~~~~~~~~~ | | | (2) out of array bounds hereIn function '
amdgpu_atom_parse':
cc1: note: source object is likely at address zero
Quoted 7 lines
Quoted 5 lines
As there isn't a sane way to convince it otherwise, hide
vbios_strfrom GCC's optimizer to avoid the warning so we can get closer to enabling -Warray-bounds globally.Signed-off-by Kees Cook <[email protected]>Acked-by Alex Deucher <[email protected]>
Thanks!
Quoted 2 lines
Do you want me to pick this up, or do you want to take this through some other tree?
Whatever is easier for you. I'm happy to carry it if you'd like. :) There's no rush on these -- it's been a long road to getting -Warray-bounds enabled. ;)
Signature · 1 line
Kees Cook
Alex Deucher
AppliedQuoted 44 lines · Kees Cook
Quoted 34 lines · Alex Deucher
Quoted 33 lines · Kees Cook
GCC really does not want to consider NULL (or near-NULL) addresses as valid, so calculations based off of NULL end up getting range-tracked into being an offset wthin a 0 byte array. It gets especially mad about this:
if (vbios_str == NULL) vbios_str += sizeof(BIOS_ATOM_PREFIX) - 1; ... if (vbios_str != NULL && *vbios_str == 0) vbios_str++;It sees this as being "
sizeof(BIOS_ATOM_PREFIX)- 1" byte offset from NULL, when building with -Warray-bounds (and the coming -fdiagnostic-details flag):In function '
atom_get_vbios_pn',
inlined from 'amdgpu_atom_parse' atdrivers/gpu/drm/amd/amdgpu/atom.c:1553:2:drivers/gpu/drm/amd/amdgpu/atom.c:1447:34: error: array subscript 0 is outside array bounds of 'unsigned char[0]' [-Werror=array-bounds=]
1447 | if (vbios_str!= NULL &&*vbios_str== 0)
| ^~~~~~~~~~
'amdgpu_atom_parse': events 1-21444 | if (vbios_str == NULL) | ^ | | | (1) when the condition is evaluated to true ...... 1447 | if (vbios_str != NULL && *vbios_str == 0) | ~~~~~~~~~~ | | | (2) out of array bounds hereIn function '
amdgpu_atom_parse':
cc1: note: source object is likely at address zeroQuoted 7 lines
Quoted 5 lines
As there isn't a sane way to convince it otherwise, hide
vbios_strfrom GCC's optimizer to avoid the warning so we can get closer to enabling -Warray-bounds globally.Signed-off-by Kees Cook <[email protected]>Acked-by Alex Deucher <[email protected]>
Quoted 8 lines
Thanks!
Quoted 2 lines
Do you want me to pick this up, or do you want to take this through some other tree?
Whatever is easier for you. I'm happy to carry it if you'd like. :) There's no rush on these -- it's been a long road to getting -Warray-bounds enabled. ;)
I've picked it up. Thanks!
Alex
Quoted 3 lines
--
Kees Cook