Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1456509 > unrolled thread
| Started by | Amitoj Kaur Chawla <amitoj1606@gmail.com> |
|---|---|
| First post | 2016-08-04 18:00 +0200 |
| Last post | 2016-08-05 10:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] drm/amdgpu: Modify error handling in amdgpu_ttm Amitoj Kaur Chawla <amitoj1606@gmail.com> - 2016-08-04 18:00 +0200
Re: [PATCH] drm/amdgpu: Modify error handling in amdgpu_ttm Christian König <deathsimple@vodafone.de> - 2016-08-05 10:10 +0200
| From | Amitoj Kaur Chawla <amitoj1606@gmail.com> |
|---|---|
| Date | 2016-08-04 18:00 +0200 |
| Subject | [PATCH] drm/amdgpu: Modify error handling in amdgpu_ttm |
| Message-ID | <s2tdT-2TC-7@gated-at.bofh.it> |
To indicate an error, debugfs_create_file can return an ERR_PTR for !CONFIG_DEBUG_FS and NULL otherwise, so in case the result is dereferenced there should be a previous IS_ERR and a NULL check. The Coccinelle semantic patch used to find the issue is as follows: @@ expression e; identifier f; @@ * e = debugfs_create_file(...); ... when != e == NULL e->f Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 8a1752f..9ff70a7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1198,6 +1198,8 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev) adev, &amdgpu_ttm_vram_fops); if (IS_ERR(ent)) return PTR_ERR(ent); + if (!ent) + return -ENOMEM; i_size_write(ent->d_inode, adev->mc.mc_vram_size); adev->mman.vram = ent; @@ -1205,6 +1207,8 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev) adev, &amdgpu_ttm_gtt_fops); if (IS_ERR(ent)) return PTR_ERR(ent); + if (!ent) + return -ENOMEM; i_size_write(ent->d_inode, adev->mc.gtt_size); adev->mman.gtt = ent; -- 1.9.1
[toc] | [next] | [standalone]
| From | Christian König <deathsimple@vodafone.de> |
|---|---|
| Date | 2016-08-05 10:10 +0200 |
| Message-ID | <s2ImC-4WB-21@gated-at.bofh.it> |
| In reply to | #1456509 |
Am 04.08.2016 um 17:42 schrieb Amitoj Kaur Chawla: > To indicate an error, debugfs_create_file can return an ERR_PTR for > !CONFIG_DEBUG_FS and NULL otherwise, so in case the result is > dereferenced there should be a previous IS_ERR and a NULL check. > > The Coccinelle semantic patch used to find the issue is as follows: > @@ > expression e; > identifier f; > @@ > > * e = debugfs_create_file(...); > ... when != e == NULL > e->f > > Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> The whole section is surrounded by CONFIG_DEBUG_FS, so I suggest to just replace the check or IS_ERR with a NULL check. Regards, Christian. > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 8a1752f..9ff70a7 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -1198,6 +1198,8 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev) > adev, &amdgpu_ttm_vram_fops); > if (IS_ERR(ent)) > return PTR_ERR(ent); > + if (!ent) > + return -ENOMEM; > i_size_write(ent->d_inode, adev->mc.mc_vram_size); > adev->mman.vram = ent; > > @@ -1205,6 +1207,8 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev) > adev, &amdgpu_ttm_gtt_fops); > if (IS_ERR(ent)) > return PTR_ERR(ent); > + if (!ent) > + return -ENOMEM; > i_size_write(ent->d_inode, adev->mc.gtt_size); > adev->mman.gtt = ent; >
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web