From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 21 Mar 2019 06:28:22 +0000 Subject: [PATCH] drm/amd/powerplay: Fix double unlock bug in smu_sys_set_pp_table() Message-Id: <20190321062822.GD21489@kadam> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Alex Deucher , Kevin Wang Cc: "David (ChunMing) Zhou" , Chengming Gui , David Airlie , kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Huang Rui , Daniel Vetter , Likun Gao , Christian =?iso-8859-1?Q?K=F6nig?= We already unlocked a few lines earlier so this code unlocks twice on the success path. Fixes: 5809d7420f97 ("drm/amd/powerplay: implement sysfs of pp_table for smu11 (v2)") Signed-off-by: Dan Carpenter --- I'm not sure what this bug looks like at runtime, but it's slightly weird that no one noticed. This is from static analysis and I haven't tested it myself. drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 00b7c885772b..7e8c74da6a74 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -187,6 +187,8 @@ int smu_sys_set_pp_table(struct smu_context *smu, void *buf, size_t size) if (ret) pr_info("smu reset failed, ret = %d\n", ret); + return ret; + failed: mutex_unlock(&smu->mutex); return ret; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/amd/powerplay: Fix double unlock bug in smu_sys_set_pp_table() Date: Thu, 21 Mar 2019 09:28:22 +0300 Message-ID: <20190321062822.GD21489@kadam> 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: Alex Deucher , Kevin Wang Cc: "David (ChunMing) Zhou" , Chengming Gui , David Airlie , kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Huang Rui , Daniel Vetter , Likun Gao , Christian =?iso-8859-1?Q?K=F6nig?= V2UgYWxyZWFkeSB1bmxvY2tlZCBhIGZldyBsaW5lcyBlYXJsaWVyIHNvIHRoaXMgY29kZSB1bmxv Y2tzIHR3aWNlIG9uCnRoZSBzdWNjZXNzIHBhdGguCgpGaXhlczogNTgwOWQ3NDIwZjk3ICgiZHJt L2FtZC9wb3dlcnBsYXk6IGltcGxlbWVudCBzeXNmcyBvZiBwcF90YWJsZSBmb3Igc211MTEgKHYy KSIpClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNv bT4KLS0tCkknbSBub3Qgc3VyZSB3aGF0IHRoaXMgYnVnIGxvb2tzIGxpa2UgYXQgcnVudGltZSwg YnV0IGl0J3Mgc2xpZ2h0bHkKd2VpcmQgdGhhdCBubyBvbmUgbm90aWNlZC4gIFRoaXMgaXMgZnJv bSBzdGF0aWMgYW5hbHlzaXMgYW5kIEkgaGF2ZW4ndAp0ZXN0ZWQgaXQgbXlzZWxmLgoKIGRyaXZl cnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2FtZGdwdV9zbXUuYyB8IDIgKysKIDEgZmlsZSBjaGFu Z2VkLCAyIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bv d2VycGxheS9hbWRncHVfc211LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9hbWRn cHVfc211LmMKaW5kZXggMDBiN2M4ODU3NzJiLi43ZThjNzRkYTZhNzQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2FtZGdwdV9zbXUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL3Bvd2VycGxheS9hbWRncHVfc211LmMKQEAgLTE4Nyw2ICsxODcsOCBAQCBpbnQg c211X3N5c19zZXRfcHBfdGFibGUoc3RydWN0IHNtdV9jb250ZXh0ICpzbXUsICB2b2lkICpidWYs IHNpemVfdCBzaXplKQogCWlmIChyZXQpCiAJCXByX2luZm8oInNtdSByZXNldCBmYWlsZWQsIHJl dCA9ICVkXG4iLCByZXQpOwogCisJcmV0dXJuIHJldDsKKwogZmFpbGVkOgogCW11dGV4X3VubG9j aygmc211LT5tdXRleCk7CiAJcmV0dXJuIHJldDsKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1k LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4