drm/nouveau/disp: Fix nvif_outp_acquire_dp() argument size
Subsystems (3)
PATCH 1/1 drm/nouveau/disp: Fix nvif_outp_acquire_dp() argument size
Both Coverity and GCC with -Wstringop-overflow noticed that nvif_outp_acquire_dp() accidentally defined its second argument with 1 additional element:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_pior_atomic_enable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: error: 'nvif_outp_acquire_dp' accessing 16 bytes in a region of size 15 [-Werror=stringop-overflow=]
1813 | nvif_outp_acquire_dp(&nv_encoder->outp, nv_encoder->dp.dpcd, 0, 0, false, false);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: note: referencing argument 2 of type 'u8[16]' {aka 'unsigned char[16]'}
drivers/gpu/drm/nouveau/include/nvif/outp.h:24:5: note: in a call to function 'nvif_outp_acquire_dp'
24 | int nvif_outp_acquire_dp(struct nvif_outp *, u8 dpcd[16],
| ^~~~~~~~~~~~~~~~~~~~Avoid these warnings by defining the argument size using the matching define (DP_RECEIVER_CAP_SIZE, 15) instead of having it be a literal (and incorrect) value (16).
Addresses-Coverity-ID: 1527269 ("Memory - corruptions")
Addresses-Coverity-ID: 1527268 ("Memory - corruptions")
--- drivers/gpu/drm/nouveau/include/nvif/outp.h | 3 ++- drivers/gpu/drm/nouveau/nvif/outp.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/include/nvif/outp.h +2 -1
@@ -3,6 +3,7 @@#define __NVIF_OUTP_H__#include <nvif/object.h> #include <nvif/if0012.h> +#include <drm/display/drm_dp.h> struct nvif_disp ;struct nvif_outp {
@@ -21,7 +22,7 @@ int nvif_outp_acquire_rgb_crt(struct nvif_outp *);int nvif_outp_acquire_tmds (struct nvif_outp *,int head,bool hdmi,u8 max_ac_packet,u8 rekey,u8 scdc,bool hda);int nvif_outp_acquire_lvds (struct nvif_outp *,bool dual,bool bpc8); -int nvif_outp_acquire_dp (struct nvif_outp *,u8 dpcd[16 ], +int nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst);void nvif_outp_release (struct nvif_outp *);int nvif_outp_infoframe (struct nvif_outp *,u8 type,struct nvif_outp_infoframe_v0 *,u32 size);
drivers/gpu/drm/nouveau/nvif/outp.c +1 -1
@@ -127,7 +127,7 @@ nvif_outp_acquire(struct nvif_outp *outp, u8 proto, struct nvif_outp_acquire_v0 }int -nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[16 ], +nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst) {struct nvif_outp_acquire_v0 args;
Signature · 1 line
2.34.1
Ping. I'll take this via my tree unless someone else wants to take it...
Quoted 75 lines · Kees Cook
Both Coverity and GCC with -Wstringop-overflow noticed that
nvif_outp_acquire_dp()accidentally defined its second argument with 1 additional element:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_pior_atomic_enable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: error: 'nvif_outp_acquire_dp' accessing 16 bytes in a region of size 15 [-Werror=stringop-overflow=]1813 | nvif_outp_acquire_dp(&nv_encoder->outp, nv_encoder->dp.dpcd, 0, 0, false, false); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: note: referencing argument 2 of type 'u8[16]' {aka 'unsigned char[16]'} drivers/gpu/drm/nouveau/include/nvif/outp.h:24:5: note: in a call to function 'nvif_outp_acquire_dp' 24 | int nvif_outp_acquire_dp(struct nvif_outp *, u8 dpcd[16], | ^~~~~~~~~~~~~~~~~~~~Avoid these warnings by defining the argument size using the matching define (
DP_RECEIVER_CAP_SIZE, 15) instead of having it be a literal (and incorrect) value (16).Reported-by coverity-bot <[email protected]>Addresses-Coverity-ID: 1527269 ("Memory - corruptions")
Addresses-Coverity-ID: 1527268 ("Memory - corruptions")Fixes 813443721331 ("drm/nouveau/disp: move DP link config into acquire")Cc Ben Skeggs <[email protected]>Cc Karol Herbst <[email protected]>Cc Lyude Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Dave Airlie <[email protected]>Cc "Gustavo A. R. Silva" <[email protected]>Signed-off-by Kees Cook <[email protected]>--- drivers/gpu/drm/nouveau/include/nvif/outp.h | 3 ++- drivers/gpu/drm/nouveau/nvif/outp.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/include/nvif/outp.h +2
-1@@ -3,6 +3,7 @@#define __NVIF_OUTP_H__#include <nvif/object.h> #include <nvif/if0012.h> +#include <drm/display/drm_dp.h> struct nvif_disp ;struct nvif_outp {@@ -21,7 +22,7 @@ int nvif_outp_acquire_rgb_crt(struct nvif_outp *);int nvif_outp_acquire_tmds (struct nvif_outp *,int head,bool hdmi,u8 max_ac_packet,u8 rekey,u8 scdc,bool hda);int nvif_outp_acquire_lvds (struct nvif_outp *,bool dual,bool bpc8); -int nvif_outp_acquire_dp (struct nvif_outp *,u8 dpcd[16 ], +int nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst);void nvif_outp_release (struct nvif_outp *);int nvif_outp_infoframe (struct nvif_outp *,u8 type,struct nvif_outp_infoframe_v0 *,u32 size);drivers/gpu/drm/nouveau/nvif/outp.c +1
-1@@ -127,7 +127,7 @@ nvif_outp_acquire(struct nvif_outp *outp, u8 proto, struct nvif_outp_acquire_v0 }int -nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[16 ], +nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst) {struct nvif_outp_acquire_v0 args;Signature · 1 line
2.34.1
Signature · 1 line
Kees Cook
Sorry! I've been pretty busy until now, this is:
Let me know if you've pushed it already or if you want me to push it to drm- misc
Quoted 79 lines · Kees Cook
Ping. I'll take this via my tree unless someone else wants to take it...
Quoted 75 lines · Kees Cook
Both Coverity and GCC with -Wstringop-overflow noticed that
nvif_outp_acquire_dp()accidentally defined its second argument with 1 additional element:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_pior_atomic_enable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: error: 'nvif_outp_acquire_dp' accessing 16 bytes in a region of size 15 [-Werror=stringop-overflow=]1813 | nvif_outp_acquire_dp(&nv_encoder->outp, nv_encoder->dp.dpcd, 0, 0, false, false); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: note: referencing argument 2 of type 'u8[16]' {aka 'unsigned char[16]'} drivers/gpu/drm/nouveau/include/nvif/outp.h:24:5: note: in a call to function 'nvif_outp_acquire_dp' 24 | int nvif_outp_acquire_dp(struct nvif_outp *, u8 dpcd[16], | ^~~~~~~~~~~~~~~~~~~~Avoid these warnings by defining the argument size using the matching define (
DP_RECEIVER_CAP_SIZE, 15) instead of having it be a literal (and incorrect) value (16).Reported-by coverity-bot <[email protected]>Addresses-Coverity-ID: 1527269 ("Memory - corruptions")
Addresses-Coverity-ID: 1527268 ("Memory - corruptions")Fixes 813443721331 ("drm/nouveau/disp: move DP link config into acquire")Cc Ben Skeggs <[email protected]>Cc Karol Herbst <[email protected]>Cc Lyude Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Dave Airlie <[email protected]>Cc "Gustavo A. R. Silva" <[email protected]>Signed-off-by Kees Cook <[email protected]>--- drivers/gpu/drm/nouveau/include/nvif/outp.h | 3 ++- drivers/gpu/drm/nouveau/nvif/outp.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/include/nvif/outp.h +2
-1@@ -3,6 +3,7 @@#define __NVIF_OUTP_H__#include <nvif/object.h> #include <nvif/if0012.h> +#include <drm/display/drm_dp.h> struct nvif_disp ;struct nvif_outp {@@ -21,7 +22,7 @@ int nvif_outp_acquire_rgb_crt(struct nvif_outp *);int nvif_outp_acquire_tmds (struct nvif_outp *,int head,bool hdmi,u8 max_ac_packet,u8 rekey,u8 scdc,bool hda);int nvif_outp_acquire_lvds (struct nvif_outp *,bool dual,bool bpc8); -int nvif_outp_acquire_dp (struct nvif_outp *,u8 dpcd[16 ], +int nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst);void nvif_outp_release (struct nvif_outp *);int nvif_outp_infoframe (struct nvif_outp *,u8 type,struct nvif_outp_infoframe_v0 *,u32 size);drivers/gpu/drm/nouveau/nvif/outp.c +1
-1@@ -127,7 +127,7 @@ nvif_outp_acquire(struct nvif_outp *outp, u8 proto, struct nvif_outp_acquire_v0 }int -nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[16 ], +nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst) {struct nvif_outp_acquire_v0 args;Signature · 1 line
2.34.1
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Quoted 6 lines · Lyude Paul
Sorry! I've been pretty busy until now, this is:
Reviewed-by Lyude Paul <[email protected]>Let me know if you've pushed it already or if you want me to push it to drm- misc
Either way is fine. I'm currently carrying it, but I can easily drop it if you prefer it go via drm-misc.
Thanks!
-Kees
Quoted 87 lines · Kees Cook
Quoted 79 lines
Ping. I'll take this via my tree unless someone else wants to take it...
Quoted 75 lines · Kees Cook
Both Coverity and GCC with -Wstringop-overflow noticed that
nvif_outp_acquire_dp()accidentally defined its second argument with 1 additional element:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_pior_atomic_enable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: error: 'nvif_outp_acquire_dp' accessing 16 bytes in a region of size 15 [-Werror=stringop-overflow=]1813 | nvif_outp_acquire_dp(&nv_encoder->outp, nv_encoder->dp.dpcd, 0, 0, false, false); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: note: referencing argument 2 of type 'u8[16]' {aka 'unsigned char[16]'} drivers/gpu/drm/nouveau/include/nvif/outp.h:24:5: note: in a call to function 'nvif_outp_acquire_dp' 24 | int nvif_outp_acquire_dp(struct nvif_outp *, u8 dpcd[16], | ^~~~~~~~~~~~~~~~~~~~Avoid these warnings by defining the argument size using the matching define (
DP_RECEIVER_CAP_SIZE, 15) instead of having it be a literal (and incorrect) value (16).Reported-by coverity-bot <[email protected]>Addresses-Coverity-ID: 1527269 ("Memory - corruptions")
Addresses-Coverity-ID: 1527268 ("Memory - corruptions")Fixes 813443721331 ("drm/nouveau/disp: move DP link config into acquire")Cc Ben Skeggs <[email protected]>Cc Karol Herbst <[email protected]>Cc Lyude Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Dave Airlie <[email protected]>Cc "Gustavo A. R. Silva" <[email protected]>Signed-off-by Kees Cook <[email protected]>--- drivers/gpu/drm/nouveau/include/nvif/outp.h | 3 ++- drivers/gpu/drm/nouveau/nvif/outp.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/include/nvif/outp.h +2
-1@@ -3,6 +3,7 @@#define __NVIF_OUTP_H__#include <nvif/object.h> #include <nvif/if0012.h> +#include <drm/display/drm_dp.h> struct nvif_disp ;struct nvif_outp {@@ -21,7 +22,7 @@ int nvif_outp_acquire_rgb_crt(struct nvif_outp *);int nvif_outp_acquire_tmds (struct nvif_outp *,int head,bool hdmi,u8 max_ac_packet,u8 rekey,u8 scdc,bool hda);int nvif_outp_acquire_lvds (struct nvif_outp *,bool dual,bool bpc8); -int nvif_outp_acquire_dp (struct nvif_outp *,u8 dpcd[16 ], +int nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst);void nvif_outp_release (struct nvif_outp *);int nvif_outp_infoframe (struct nvif_outp *,u8 type,struct nvif_outp_infoframe_v0 *,u32 size);drivers/gpu/drm/nouveau/nvif/outp.c +1
-1@@ -127,7 +127,7 @@ nvif_outp_acquire(struct nvif_outp *outp, u8 proto, struct nvif_outp_acquire_v0 }int -nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[16 ], +nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst) {struct nvif_outp_acquire_v0 args;Signature · 1 line
2.34.1Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Signature · 1 line
Kees Cook
Lyude Paul
maintainerI think that shoud be fine, which branch is it on?
Quoted 103 lines · Kees Cook
Quoted 6 lines · Lyude Paul
Sorry! I've been pretty busy until now, this is:
Reviewed-by Lyude Paul <[email protected]>Let me know if you've pushed it already or if you want me to push it to drm- misc
Either way is fine. I'm currently carrying it, but I can easily drop it if you prefer it go via drm-misc.
Thanks!
-Kees
Quoted 87 lines · Kees Cook
Quoted 79 lines
Ping. I'll take this via my tree unless someone else wants to take it...
Quoted 75 lines · Kees Cook
Both Coverity and GCC with -Wstringop-overflow noticed that
nvif_outp_acquire_dp()accidentally defined its second argument with 1 additional element:
drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_pior_atomic_enable':drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: error: 'nvif_outp_acquire_dp' accessing 16 bytes in a region of size 15 [-Werror=stringop-overflow=]1813 | nvif_outp_acquire_dp(&nv_encoder->outp, nv_encoder->dp.dpcd, 0, 0, false, false); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/nouveau/dispnv50/disp.c:1813:17: note: referencing argument 2 of type 'u8[16]' {aka 'unsigned char[16]'} drivers/gpu/drm/nouveau/include/nvif/outp.h:24:5: note: in a call to function 'nvif_outp_acquire_dp' 24 | int nvif_outp_acquire_dp(struct nvif_outp *, u8 dpcd[16], | ^~~~~~~~~~~~~~~~~~~~Avoid these warnings by defining the argument size using the matching define (
DP_RECEIVER_CAP_SIZE, 15) instead of having it be a literal (and incorrect) value (16).Reported-by coverity-bot <[email protected]>Addresses-Coverity-ID: 1527269 ("Memory - corruptions")
Addresses-Coverity-ID: 1527268 ("Memory - corruptions")Fixes 813443721331 ("drm/nouveau/disp: move DP link config into acquire")Cc Ben Skeggs <[email protected]>Cc Karol Herbst <[email protected]>Cc Lyude Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Dave Airlie <[email protected]>Cc "Gustavo A. R. Silva" <[email protected]>Signed-off-by Kees Cook <[email protected]>--- drivers/gpu/drm/nouveau/include/nvif/outp.h | 3 ++- drivers/gpu/drm/nouveau/nvif/outp.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/include/nvif/outp.h +2
-1@@ -3,6 +3,7 @@#define __NVIF_OUTP_H__#include <nvif/object.h> #include <nvif/if0012.h> +#include <drm/display/drm_dp.h> struct nvif_disp ;struct nvif_outp {@@ -21,7 +22,7 @@ int nvif_outp_acquire_rgb_crt(struct nvif_outp *);int nvif_outp_acquire_tmds (struct nvif_outp *,int head,bool hdmi,u8 max_ac_packet,u8 rekey,u8 scdc,bool hda);int nvif_outp_acquire_lvds (struct nvif_outp *,bool dual,bool bpc8); -int nvif_outp_acquire_dp (struct nvif_outp *,u8 dpcd[16 ], +int nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst);void nvif_outp_release (struct nvif_outp *);int nvif_outp_infoframe (struct nvif_outp *,u8 type,struct nvif_outp_infoframe_v0 *,u32 size);drivers/gpu/drm/nouveau/nvif/outp.c +1
-1@@ -127,7 +127,7 @@ nvif_outp_acquire(struct nvif_outp *outp, u8 proto, struct nvif_outp_acquire_v0 }int -nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[16 ], +nvif_outp_acquire_dp (struct nvif_outp *outp,u8 dpcd[DP_RECEIVER_CAP_SIZE ],int link_nr,int link_bw,bool hda,bool mst) {struct nvif_outp_acquire_v0 args;Signature · 1 line
2.34.1Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat