From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/amd/powerplay: Fix error handling in smu_init_fb_allocations() Date: Mon, 7 Oct 2019 12:02:06 +0300 Message-ID: <20191007090206.GD3865@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: Rex Zhu , Kevin Wang Cc: "David (ChunMing) Zhou" , David Airlie , kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Daniel Vetter , Alex Deucher , Evan Quan , Christian =?iso-8859-1?Q?K=F6nig?= VGhlIGVycm9yIGhhbmRsaW5nIGlzIG9mZiBieSBvbmUuICBXZSBzaG91bGQgbm90IGZyZWUgdGhl IGZpcnN0CiJ0YWJsZXNbaV0uYm8iIHdpdGhvdXQgZGVjcmVtZW50aW5nICJpIiBiZWNhdXNlIHRo YXQgbWlnaHQgcmVzdWx0IGluIGEKZG91YmxlIGZyZWUuICBUaGUgc2Vjb25kIHByb2JsZW0gaXMg dGhhdCB3aGVuIGFuIGVycm9yIG9jY3VycywgdGhlbiB0aGUKemVyb3RoIGVsZW1lbnQgInRhYmxl c1swXS5ibyIgaXNuJ3QgZnJlZWQuCgpJIGhhZCBtYWtlICJpIiBzaWduZWQgaW50IGZvciB0aGUg ZXJyb3IgaGFuZGxpbmcgdG8gd29yaywgc28gSSBqdXN0CnVwZGF0ZWQgInJldCIgYXMgd2VsbCBh cyBhIGNsZWFuIHVwLgoKRml4ZXM6IGY5NjM1N2E5OTFiOSAoImRybS9hbWQvcG93ZXJwbGF5OiBp bXBsZW1lbnQgc211X2luaXQoZmluaSlfZmJfYWxsb2NhdGlvbnMgZnVuY3Rpb24iKQpTaWduZWQt b2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvYW1kZ3B1X3NtdS5jIHwgNSArKy0tLQogMSBmaWxl IGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9hbWRncHVfc211LmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL3Bvd2VycGxheS9hbWRncHVfc211LmMKaW5kZXggZjFmYmJjOGI3N2VlLi5jOTI2NmVh NzAzMzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2FtZGdwdV9z bXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9hbWRncHVfc211LmMKQEAg LTg5Niw4ICs4OTYsNyBAQCBzdGF0aWMgaW50IHNtdV9pbml0X2ZiX2FsbG9jYXRpb25zKHN0cnVj dCBzbXVfY29udGV4dCAqc211KQogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gc211LT5h ZGV2OwogCXN0cnVjdCBzbXVfdGFibGVfY29udGV4dCAqc211X3RhYmxlID0gJnNtdS0+c211X3Rh YmxlOwogCXN0cnVjdCBzbXVfdGFibGUgKnRhYmxlcyA9IHNtdV90YWJsZS0+dGFibGVzOwotCXVp bnQzMl90IGkgPSAwOwotCWludDMyX3QgcmV0ID0gMDsKKwlpbnQgcmV0LCBpOwogCiAJZm9yIChp ID0gMDsgaSA8IFNNVV9UQUJMRV9DT1VOVDsgaSsrKSB7CiAJCWlmICh0YWJsZXNbaV0uc2l6ZSA9 PSAwKQpAQCAtOTE1LDcgKzkxNCw3IEBAIHN0YXRpYyBpbnQgc211X2luaXRfZmJfYWxsb2NhdGlv bnMoc3RydWN0IHNtdV9jb250ZXh0ICpzbXUpCiAKIAlyZXR1cm4gMDsKIGZhaWxlZDoKLQlmb3Ig KDsgaSA+IDA7IGktLSkgeworCXdoaWxlICgtLWkgPj0gMCkgewogCQlpZiAodGFibGVzW2ldLnNp emUgPT0gMCkKIAkJCWNvbnRpbnVlOwogCQlhbWRncHVfYm9fZnJlZV9rZXJuZWwoJnRhYmxlc1tp XS5ibywKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Mon, 07 Oct 2019 09:02:06 +0000 Subject: [PATCH] drm/amd/powerplay: Fix error handling in smu_init_fb_allocations() Message-Id: <20191007090206.GD3865@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Rex Zhu , Kevin Wang Cc: "David (ChunMing) Zhou" , David Airlie , kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Daniel Vetter , Alex Deucher , Evan Quan , Christian =?iso-8859-1?Q?K=F6nig?= The error handling is off by one. We should not free the first "tables[i].bo" without decrementing "i" because that might result in a double free. The second problem is that when an error occurs, then the zeroth element "tables[0].bo" isn't freed. I had make "i" signed int for the error handling to work, so I just updated "ret" as well as a clean up. Fixes: f96357a991b9 ("drm/amd/powerplay: implement smu_init(fini)_fb_allocations function") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index f1fbbc8b77ee..c9266ea70331 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -896,8 +896,7 @@ static int smu_init_fb_allocations(struct smu_context *smu) struct amdgpu_device *adev = smu->adev; struct smu_table_context *smu_table = &smu->smu_table; struct smu_table *tables = smu_table->tables; - uint32_t i = 0; - int32_t ret = 0; + int ret, i; for (i = 0; i < SMU_TABLE_COUNT; i++) { if (tables[i].size = 0) @@ -915,7 +914,7 @@ static int smu_init_fb_allocations(struct smu_context *smu) return 0; failed: - for (; i > 0; i--) { + while (--i >= 0) { if (tables[i].size = 0) continue; amdgpu_bo_free_kernel(&tables[i].bo, -- 2.20.1