From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Tue, 25 Nov 2014 10:24:51 +0000 Subject: [patch] amdkfd: fix an error handling bug in pqm_create_queue() Message-Id: <20141125102451.GC23215@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Oded Gabbay , Ben Goz Cc: kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org The call to kernel_queue_uninit(NULL) will trigger a BUG(), and also the error code is incorrect. Fixes: 45102048f77e ('amdkfd: Add process queue manager module') Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c index c7859fc..7ce7a25 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c @@ -208,7 +208,7 @@ int pqm_create_queue(struct process_queue_manager *pqm, case KFD_QUEUE_TYPE_DIQ: kq = kernel_queue_init(dev, KFD_QUEUE_TYPE_DIQ); if (kq = NULL) { - kernel_queue_uninit(kq); + retval = -ENOMEM; goto err_create_queue; } kq->queue->properties.queue_id = *qid; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] amdkfd: fix an error handling bug in pqm_create_queue() Date: Tue, 25 Nov 2014 13:24:51 +0300 Message-ID: <20141125102451.GC23215@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by gabe.freedesktop.org (Postfix) with ESMTP id 505456E116 for ; Tue, 25 Nov 2014 02:25:04 -0800 (PST) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Oded Gabbay , Ben Goz Cc: kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIGNhbGwgdG8ga2VybmVsX3F1ZXVlX3VuaW5pdChOVUxMKSB3aWxsIHRyaWdnZXIgYSBCVUco KSwgYW5kIGFsc28gdGhlCmVycm9yIGNvZGUgaXMgaW5jb3JyZWN0LgoKRml4ZXM6IDQ1MTAyMDQ4 Zjc3ZSAoJ2FtZGtmZDogQWRkIHByb2Nlc3MgcXVldWUgbWFuYWdlciBtb2R1bGUnKQpTaWduZWQt b2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+CgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3Byb2Nlc3NfcXVldWVfbWFuYWdl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3Byb2Nlc3NfcXVldWVfbWFuYWdl ci5jCmluZGV4IGM3ODU5ZmMuLjdjZTdhMjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1ka2ZkL2tmZF9wcm9jZXNzX3F1ZXVlX21hbmFnZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGtmZC9rZmRfcHJvY2Vzc19xdWV1ZV9tYW5hZ2VyLmMKQEAgLTIwOCw3ICsyMDgs NyBAQCBpbnQgcHFtX2NyZWF0ZV9xdWV1ZShzdHJ1Y3QgcHJvY2Vzc19xdWV1ZV9tYW5hZ2VyICpw cW0sCiAJY2FzZSBLRkRfUVVFVUVfVFlQRV9ESVE6CiAJCWtxID0ga2VybmVsX3F1ZXVlX2luaXQo ZGV2LCBLRkRfUVVFVUVfVFlQRV9ESVEpOwogCQlpZiAoa3EgPT0gTlVMTCkgewotCQkJa2VybmVs X3F1ZXVlX3VuaW5pdChrcSk7CisJCQlyZXR2YWwgPSAtRU5PTUVNOwogCQkJZ290byBlcnJfY3Jl YXRlX3F1ZXVlOwogCQl9CiAJCWtxLT5xdWV1ZS0+cHJvcGVydGllcy5xdWV1ZV9pZCA9ICpxaWQ7 Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==