* [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr
@ 2019-11-15 9:47 Colin King
2019-11-15 9:47 ` Colin King
2019-11-18 6:56 ` Quan, Evan
0 siblings, 2 replies; 5+ messages in thread
From: Colin King @ 2019-11-15 9:47 UTC (permalink / raw)
To: Rex Zhu, Evan Quan, Alex Deucher, Christian König,
David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The assignment of adev dereferences pointer hwmgr before hwmgr is null
checked, hence there is a potential null pointer deference issue. Fix
this by assigning adev after the null check.
Addresses-Coverity: ("Dereference before null check")
Fixes: 0896d2f7ba4d ("drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 443625c83ec9..d2909c91d65b 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -81,7 +81,7 @@ static void hwmgr_init_workload_prority(struct pp_hwmgr *hwmgr)
int hwmgr_early_init(struct pp_hwmgr *hwmgr)
{
- struct amdgpu_device *adev = hwmgr->adev;
+ struct amdgpu_device *adev;
if (!hwmgr)
return -EINVAL;
@@ -96,6 +96,8 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)
hwmgr_init_workload_prority(hwmgr);
hwmgr->gfxoff_state_changed_by_workload = false;
+ adev = hwmgr->adev;
+
switch (hwmgr->chip_family) {
case AMDGPU_FAMILY_CI:
adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr 2019-11-15 9:47 [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr Colin King @ 2019-11-15 9:47 ` Colin King 2019-11-18 6:56 ` Quan, Evan 1 sibling, 0 replies; 5+ messages in thread From: Colin King @ 2019-11-15 9:47 UTC (permalink / raw) To: Rex Zhu, Evan Quan, Alex Deucher, Christian König, David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel Cc: kernel-janitors, linux-kernel From: Colin Ian King <colin.king@canonical.com> The assignment of adev dereferences pointer hwmgr before hwmgr is null checked, hence there is a potential null pointer deference issue. Fix this by assigning adev after the null check. Addresses-Coverity: ("Dereference before null check") Fixes: 0896d2f7ba4d ("drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK") Signed-off-by: Colin Ian King <colin.king@canonical.com> --- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 443625c83ec9..d2909c91d65b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c @@ -81,7 +81,7 @@ static void hwmgr_init_workload_prority(struct pp_hwmgr *hwmgr) int hwmgr_early_init(struct pp_hwmgr *hwmgr) { - struct amdgpu_device *adev = hwmgr->adev; + struct amdgpu_device *adev; if (!hwmgr) return -EINVAL; @@ -96,6 +96,8 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr) hwmgr_init_workload_prority(hwmgr); hwmgr->gfxoff_state_changed_by_workload = false; + adev = hwmgr->adev; + switch (hwmgr->chip_family) { case AMDGPU_FAMILY_CI: adev->pm.pp_feature &= ~PP_GFXOFF_MASK; -- 2.20.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr 2019-11-15 9:47 [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr Colin King 2019-11-15 9:47 ` Colin King @ 2019-11-18 6:56 ` Quan, Evan 2019-11-18 17:47 ` Alex Deucher 1 sibling, 1 reply; 5+ messages in thread From: Quan, Evan @ 2019-11-18 6:56 UTC (permalink / raw) To: Colin King, Rex Zhu, Deucher, Alexander, Koenig, Christian, Zhou, David(ChunMing), David Airlie, Daniel Vetter, amd-gfx, dri-devel Cc: kernel-janitors, linux-kernel Reviewed-by: Evan Quan <evan.quan@amd.com> -----Original Message----- From: Colin King <colin.king@canonical.com> Sent: Friday, November 15, 2019 5:48 PM To: Rex Zhu <rex.zhu@amd.com>; Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Zhou, David(ChunMing) <David1.Zhou@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org Subject: [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr From: Colin Ian King <colin.king@canonical.com> The assignment of adev dereferences pointer hwmgr before hwmgr is null checked, hence there is a potential null pointer deference issue. Fix this by assigning adev after the null check. Addresses-Coverity: ("Dereference before null check") Fixes: 0896d2f7ba4d ("drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK") Signed-off-by: Colin Ian King <colin.king@canonical.com> --- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 443625c83ec9..d2909c91d65b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c @@ -81,7 +81,7 @@ static void hwmgr_init_workload_prority(struct pp_hwmgr *hwmgr) int hwmgr_early_init(struct pp_hwmgr *hwmgr) { - struct amdgpu_device *adev = hwmgr->adev; + struct amdgpu_device *adev; if (!hwmgr) return -EINVAL; @@ -96,6 +96,8 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr) hwmgr_init_workload_prority(hwmgr); hwmgr->gfxoff_state_changed_by_workload = false; + adev = hwmgr->adev; + switch (hwmgr->chip_family) { case AMDGPU_FAMILY_CI: adev->pm.pp_feature &= ~PP_GFXOFF_MASK; -- 2.20.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr 2019-11-18 6:56 ` Quan, Evan @ 2019-11-18 17:47 ` Alex Deucher 2019-11-18 17:47 ` Alex Deucher 0 siblings, 1 reply; 5+ messages in thread From: Alex Deucher @ 2019-11-18 17:47 UTC (permalink / raw) To: Quan, Evan Cc: Colin King, Rex Zhu, Deucher, Alexander, Koenig, Christian, Zhou, David(ChunMing), David Airlie, Daniel Vetter, amd-gfx, dri-devel, kernel-janitors, linux-kernel Applied. Thanks! Alex On Mon, Nov 18, 2019 at 1:56 AM Quan, Evan <Evan.Quan@amd.com> wrote: > > Reviewed-by: Evan Quan <evan.quan@amd.com> > > -----Original Message----- > From: Colin King <colin.king@canonical.com> > Sent: Friday, November 15, 2019 5:48 PM > To: Rex Zhu <rex.zhu@amd.com>; Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Zhou, David(ChunMing) <David1.Zhou@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr > > From: Colin Ian King <colin.king@canonical.com> > > The assignment of adev dereferences pointer hwmgr before hwmgr is null checked, hence there is a potential null pointer deference issue. Fix this by assigning adev after the null check. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 0896d2f7ba4d ("drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > index 443625c83ec9..d2909c91d65b 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > @@ -81,7 +81,7 @@ static void hwmgr_init_workload_prority(struct pp_hwmgr *hwmgr) > > int hwmgr_early_init(struct pp_hwmgr *hwmgr) { > - struct amdgpu_device *adev = hwmgr->adev; > + struct amdgpu_device *adev; > > if (!hwmgr) > return -EINVAL; > @@ -96,6 +96,8 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr) > hwmgr_init_workload_prority(hwmgr); > hwmgr->gfxoff_state_changed_by_workload = false; > > + adev = hwmgr->adev; > + > switch (hwmgr->chip_family) { > case AMDGPU_FAMILY_CI: > adev->pm.pp_feature &= ~PP_GFXOFF_MASK; > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr 2019-11-18 17:47 ` Alex Deucher @ 2019-11-18 17:47 ` Alex Deucher 0 siblings, 0 replies; 5+ messages in thread From: Alex Deucher @ 2019-11-18 17:47 UTC (permalink / raw) To: Quan, Evan Cc: David Airlie, kernel-janitors, linux-kernel, amd-gfx, dri-devel, Deucher, Alexander, Colin King, Rex Zhu, Koenig, Christian Applied. Thanks! Alex On Mon, Nov 18, 2019 at 1:56 AM Quan, Evan <Evan.Quan@amd.com> wrote: > > Reviewed-by: Evan Quan <evan.quan@amd.com> > > -----Original Message----- > From: Colin King <colin.king@canonical.com> > Sent: Friday, November 15, 2019 5:48 PM > To: Rex Zhu <rex.zhu@amd.com>; Quan, Evan <Evan.Quan@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Zhou, David(ChunMing) <David1.Zhou@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr > > From: Colin Ian King <colin.king@canonical.com> > > The assignment of adev dereferences pointer hwmgr before hwmgr is null checked, hence there is a potential null pointer deference issue. Fix this by assigning adev after the null check. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 0896d2f7ba4d ("drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > index 443625c83ec9..d2909c91d65b 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > @@ -81,7 +81,7 @@ static void hwmgr_init_workload_prority(struct pp_hwmgr *hwmgr) > > int hwmgr_early_init(struct pp_hwmgr *hwmgr) { > - struct amdgpu_device *adev = hwmgr->adev; > + struct amdgpu_device *adev; > > if (!hwmgr) > return -EINVAL; > @@ -96,6 +96,8 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr) > hwmgr_init_workload_prority(hwmgr); > hwmgr->gfxoff_state_changed_by_workload = false; > > + adev = hwmgr->adev; > + > switch (hwmgr->chip_family) { > case AMDGPU_FAMILY_CI: > adev->pm.pp_feature &= ~PP_GFXOFF_MASK; > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-18 17:48 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-11-15 9:47 [PATCH][next] drm/amdgpu/powerplay: fix dereference before null check of pointer hwmgr Colin King 2019-11-15 9:47 ` Colin King 2019-11-18 6:56 ` Quan, Evan 2019-11-18 17:47 ` Alex Deucher 2019-11-18 17:47 ` Alex Deucher
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).