From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haneen Mohammed Subject: [PATCH] drm: Add checks for NULL drm_*_helper_funcs Date: Fri, 25 May 2018 05:20:08 +0300 Message-ID: <20180525022008.GA29417@haneen-vb> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C94B16E845 for ; Fri, 25 May 2018 02:20:15 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id a15-v6so6464670wrm.0 for ; Thu, 24 May 2018 19:20:15 -0700 (PDT) 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: dri-devel Cc: rodrigosiqueiramelo@gmail.com, David Airlie , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VGhpcyBwYXRjaCBhZGQgY2hlY2tzIGZvciBOVUxMIGRybV9bY29ubmVjdG9yL2NydGMvcGxhbmVd X2hlbHBlcl9mdW5jcwpwb2ludGVycyBiZWZvcmUgZGVyZWZyZW5jaW5nIHRoZSB2YXJpYWJsZSB0 byBhdm9pZCBOVUxMIHBvaW50ZXIKZGVyZWZlcmVuY2UgYW5kIG1ha2UgdGhlIGhlbHBlciBmdW5j dGlvbnMgYXMgb3B0aW9uYWwgYXMgcG9zc2libGUuCgpTaWduZWQtb2ZmLWJ5OiBIYW5lZW4gTW9o YW1tZWQgPGhhbW9oYW1tZWQuc2FAZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1f YXRvbWljX2hlbHBlci5jIHwgNDIgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9kcm1fcHJvYmVfaGVscGVyLmMgIHwgMTEgKysrKy0tLS0KIDIgZmlsZXMgY2hh bmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYwppbmRleCBjMzU2NTQ1OTFjMTIuLjUyMDkyZGViNzQxZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAgLTExMiw5ICsxMTIsOSBAQCBzdGF0aWMgaW50IGhh bmRsZV9jb25mbGljdGluZ19lbmNvZGVycyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUs CiAJCWlmICghbmV3X2Nvbm5fc3RhdGUtPmNydGMpCiAJCQljb250aW51ZTsKIAotCQlpZiAoZnVu Y3MtPmF0b21pY19iZXN0X2VuY29kZXIpCisJCWlmIChmdW5jcyAmJiBmdW5jcy0+YXRvbWljX2Jl c3RfZW5jb2RlcikKIAkJCW5ld19lbmNvZGVyID0gZnVuY3MtPmF0b21pY19iZXN0X2VuY29kZXIo Y29ubmVjdG9yLCBuZXdfY29ubl9zdGF0ZSk7Ci0JCWVsc2UgaWYgKGZ1bmNzLT5iZXN0X2VuY29k ZXIpCisJCWVsc2UgaWYgKGZ1bmNzICYmIGZ1bmNzLT5iZXN0X2VuY29kZXIpCiAJCQluZXdfZW5j b2RlciA9IGZ1bmNzLT5iZXN0X2VuY29kZXIoY29ubmVjdG9yKTsKIAkJZWxzZQogCQkJbmV3X2Vu Y29kZXIgPSBkcm1fYXRvbWljX2hlbHBlcl9iZXN0X2VuY29kZXIoY29ubmVjdG9yKTsKQEAgLTMw OCwxMCArMzA4LDEwIEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUsCiAKIAlmdW5jcyA9IGNvbm5lY3Rvci0+aGVscGVyX3ByaXZhdGU7CiAK LQlpZiAoZnVuY3MtPmF0b21pY19iZXN0X2VuY29kZXIpCisJaWYgKGZ1bmNzICYmIGZ1bmNzLT5h dG9taWNfYmVzdF9lbmNvZGVyKQogCQluZXdfZW5jb2RlciA9IGZ1bmNzLT5hdG9taWNfYmVzdF9l bmNvZGVyKGNvbm5lY3RvciwKIAkJCQkJCQkgbmV3X2Nvbm5lY3Rvcl9zdGF0ZSk7Ci0JZWxzZSBp ZiAoZnVuY3MtPmJlc3RfZW5jb2RlcikKKwllbHNlIGlmIChmdW5jcyAmJiBmdW5jcy0+YmVzdF9l bmNvZGVyKQogCQluZXdfZW5jb2RlciA9IGZ1bmNzLT5iZXN0X2VuY29kZXIoY29ubmVjdG9yKTsK IAllbHNlCiAJCW5ld19lbmNvZGVyID0gZHJtX2F0b21pY19oZWxwZXJfYmVzdF9lbmNvZGVyKGNv bm5lY3Rvcik7CkBAIC00MzgsNyArNDM4LDcgQEAgbW9kZV9maXh1cChzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUpCiAJCQljb250aW51ZTsKIAogCQlmdW5jcyA9IGNydGMtPmhlbHBlcl9w cml2YXRlOwotCQlpZiAoIWZ1bmNzLT5tb2RlX2ZpeHVwKQorCQlpZiAoIWZ1bmNzIHx8ICFmdW5j cy0+bW9kZV9maXh1cCkKIAkJCWNvbnRpbnVlOwogCiAJCXJldCA9IGZ1bmNzLT5tb2RlX2ZpeHVw KGNydGMsICZuZXdfY3J0Y19zdGF0ZS0+bW9kZSwKQEAgLTYzOSw3ICs2MzksNyBAQCBkcm1fYXRv bWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJbmV3 X2NydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAJCX0KIAotCQlpZiAoZnVu Y3MtPmF0b21pY19jaGVjaykKKwkJaWYgKGZ1bmNzICYmIGZ1bmNzLT5hdG9taWNfY2hlY2spCiAJ CQlyZXQgPSBmdW5jcy0+YXRvbWljX2NoZWNrKGNvbm5lY3RvciwgbmV3X2Nvbm5lY3Rvcl9zdGF0 ZSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwpAQCAtNjgxLDcgKzY4MSw3IEBAIGRybV9h dG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYg KGNvbm5lY3RvcnNfbWFzayAmIEJJVChpKSkKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChmdW5jcy0+ YXRvbWljX2NoZWNrKQorCQlpZiAoZnVuY3MgJiYgZnVuY3MtPmF0b21pY19jaGVjaykKIAkJCXJl dCA9IGZ1bmNzLT5hdG9taWNfY2hlY2soY29ubmVjdG9yLCBuZXdfY29ubmVjdG9yX3N0YXRlKTsK IAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CkBAIC05NzIsMTQgKzk3MiwxNiBAQCBkaXNhYmxl X291dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9hdG9taWNfc3RhdGUg Km9sZF9zdGF0ZSkKIAogCiAJCS8qIFJpZ2h0IGZ1bmN0aW9uIGRlcGVuZHMgdXBvbiB0YXJnZXQg c3RhdGUuICovCi0JCWlmIChuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlICYmIGZ1bmNzLT5wcmVwYXJl KQotCQkJZnVuY3MtPnByZXBhcmUoY3J0Yyk7Ci0JCWVsc2UgaWYgKGZ1bmNzLT5hdG9taWNfZGlz YWJsZSkKLQkJCWZ1bmNzLT5hdG9taWNfZGlzYWJsZShjcnRjLCBvbGRfY3J0Y19zdGF0ZSk7Ci0J CWVsc2UgaWYgKGZ1bmNzLT5kaXNhYmxlKQotCQkJZnVuY3MtPmRpc2FibGUoY3J0Yyk7Ci0JCWVs c2UKLQkJCWZ1bmNzLT5kcG1zKGNydGMsIERSTV9NT0RFX0RQTVNfT0ZGKTsKKwkJaWYgKGZ1bmNz KSB7CisJCQlpZiAobmV3X2NydGNfc3RhdGUtPmVuYWJsZSAmJiBmdW5jcy0+cHJlcGFyZSkKKwkJ CQlmdW5jcy0+cHJlcGFyZShjcnRjKTsKKwkJCWVsc2UgaWYgKGZ1bmNzLT5hdG9taWNfZGlzYWJs ZSkKKwkJCQlmdW5jcy0+YXRvbWljX2Rpc2FibGUoY3J0Yywgb2xkX2NydGNfc3RhdGUpOworCQkJ ZWxzZSBpZiAoZnVuY3MtPmRpc2FibGUpCisJCQkJZnVuY3MtPmRpc2FibGUoY3J0Yyk7CisJCQll bHNlCisJCQkJZnVuY3MtPmRwbXMoY3J0YywgRFJNX01PREVfRFBNU19PRkYpOworCQl9CiAKIAkJ aWYgKCEoZGV2LT5pcnFfZW5hYmxlZCAmJiBkZXYtPm51bV9jcnRjcykpCiAJCQljb250aW51ZTsK QEAgLTEwOTMsNyArMTA5NSw3IEBAIGNydGNfc2V0X21vZGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIAogCQlmdW5jcyA9IGNydGMt PmhlbHBlcl9wcml2YXRlOwogCi0JCWlmIChuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlICYmIGZ1bmNz LT5tb2RlX3NldF9ub2ZiKSB7CisJCWlmIChuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlICYmIGZ1bmNz ICYmIGZ1bmNzLT5tb2RlX3NldF9ub2ZiKSB7CiAJCQlEUk1fREVCVUdfQVRPTUlDKCJtb2Rlc2V0 IG9uIFtDUlRDOiVkOiVzXVxuIiwKIAkJCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOwog CkBAIC0xMTk3LDcgKzExOTksNyBAQCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9tb2Rl c2V0X2VuYWJsZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCQlmdW5jcyA9IGNydGMtPmhl bHBlcl9wcml2YXRlOwogCi0JCWlmIChuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlKSB7CisJCWlmIChm dW5jcyAmJiBuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlKSB7CiAJCQlEUk1fREVCVUdfQVRPTUlDKCJl bmFibGluZyBbQ1JUQzolZDolc11cbiIsCiAJCQkJCSBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1l KTsKIApAQCAtMjExNyw3ICsyMTE5LDcgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX3ByZXBhcmVf cGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJZnVuY3MgPSBwbGFuZS0+aGVscGVy X3ByaXZhdGU7CiAKLQkJaWYgKGZ1bmNzLT5wcmVwYXJlX2ZiKSB7CisJCWlmIChmdW5jcyAmJiBm dW5jcy0+cHJlcGFyZV9mYikgewogCQkJcmV0ID0gZnVuY3MtPnByZXBhcmVfZmIocGxhbmUsIG5l d19wbGFuZV9zdGF0ZSk7CiAJCQlpZiAocmV0KQogCQkJCWdvdG8gZmFpbDsKQEAgLTIxMzUsNyAr MjEzNyw3IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9wcmVwYXJlX3BsYW5lcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCiAJCWZ1bmNzID0gcGxhbmUtPmhlbHBlcl9wcml2YXRlOwogCi0JCWlm IChmdW5jcy0+Y2xlYW51cF9mYikKKwkJaWYgKGZ1bmNzICYmIGZ1bmNzLT5jbGVhbnVwX2ZiKQog CQkJZnVuY3MtPmNsZWFudXBfZmIocGxhbmUsIG5ld19wbGFuZV9zdGF0ZSk7CiAJfQogCkBAIC0y NDEyLDcgKzI0MTQsNyBAQCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2NsZWFudXBfcGxhbmVzKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJZnVuY3MgPSBwbGFuZS0+aGVscGVyX3ByaXZhdGU7 CiAKLQkJaWYgKGZ1bmNzLT5jbGVhbnVwX2ZiKQorCQlpZiAoZnVuY3MgJiYgZnVuY3MtPmNsZWFu dXBfZmIpCiAJCQlmdW5jcy0+Y2xlYW51cF9mYihwbGFuZSwgcGxhbmVfc3RhdGUpOwogCX0KIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvYmVfaGVscGVyLmMgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5jCmluZGV4IDUyNzc0MzM5NDE1MC4uNDI1MDdhYTdm NzYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvYmVfaGVscGVyLmMKQEAgLTI3Miw5ICsyNzIsOSBAQCBk cm1faGVscGVyX3Byb2JlX2RldGVjdF9jdHgoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv ciwgYm9vbCBmb3JjZSkKIHJldHJ5OgogCXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJmNvbm5lY3Rv ci0+ZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4LCAmY3R4KTsKIAlpZiAoIXJldCkg ewotCQlpZiAoZnVuY3MtPmRldGVjdF9jdHgpCisJCWlmIChmdW5jcyAmJiBmdW5jcy0+ZGV0ZWN0 X2N0eCkKIAkJCXJldCA9IGZ1bmNzLT5kZXRlY3RfY3R4KGNvbm5lY3RvciwgJmN0eCwgZm9yY2Up OwotCQllbHNlIGlmIChjb25uZWN0b3ItPmZ1bmNzLT5kZXRlY3QpCisJCWVsc2UgaWYgKGNvbm5l Y3Rvci0+ZnVuY3MgJiYgY29ubmVjdG9yLT5mdW5jcy0+ZGV0ZWN0KQogCQkJcmV0ID0gY29ubmVj dG9yLT5mdW5jcy0+ZGV0ZWN0KGNvbm5lY3RvciwgZm9yY2UpOwogCQllbHNlCiAJCQlyZXQgPSBj b25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKQEAgLTMyMCw5ICszMjAsOSBAQCBkcm1faGVscGVy X3Byb2JlX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKLQlpZiAoZnVuY3MtPmRldGVjdF9jdHgpCisJaWYgKGZ1bmNzICYm IGZ1bmNzLT5kZXRlY3RfY3R4KQogCQlyZXR1cm4gZnVuY3MtPmRldGVjdF9jdHgoY29ubmVjdG9y LCBjdHgsIGZvcmNlKTsKLQllbHNlIGlmIChjb25uZWN0b3ItPmZ1bmNzLT5kZXRlY3QpCisJZWxz ZSBpZiAoY29ubmVjdG9yLT5mdW5jcyAmJiBjb25uZWN0b3ItPmZ1bmNzLT5kZXRlY3QpCiAJCXJl dHVybiBjb25uZWN0b3ItPmZ1bmNzLT5kZXRlY3QoY29ubmVjdG9yLCBmb3JjZSk7CiAJZWxzZQog CQlyZXR1cm4gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7CkBAIC00ODAsNyArNDgwLDggQEAg aW50IGRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcyhzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yLAogCQlnb3RvIHBydW5lOwogCX0KIAotCWNvdW50ID0gKCpjb25u ZWN0b3JfZnVuY3MtPmdldF9tb2RlcykoY29ubmVjdG9yKTsKKwlpZiAoY29ubmVjdG9yX2Z1bmNz ICYmIGNvbm5lY3Rvcl9mdW5jcy0+Z2V0X21vZGVzKQorCQljb3VudCA9ICgqY29ubmVjdG9yX2Z1 bmNzLT5nZXRfbW9kZXMpKGNvbm5lY3Rvcik7CiAKIAlpZiAoY291bnQgPT0gMCAmJiBjb25uZWN0 b3ItPnN0YXR1cyA9PSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZCkKIAkJY291bnQgPSBkcm1f YWRkX21vZGVzX25vZWRpZChjb25uZWN0b3IsIDEwMjQsIDc2OCk7Ci0tIAoyLjE3LjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=