From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Bragg Subject: [PATCH v2] drm/i915: don't whitelist oacontrol in cmd parser Date: Tue, 8 Nov 2016 12:51:48 +0000 Message-ID: <20161108125148.25007-1-robert@sixbynine.org> References: <20161107194957.3385-5-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161107194957.3385-5-robert@sixbynine.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: David Airlie , dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VGhpcyB2MiBwYXRjaCBidW1wcyB0aGUgY29tbWFuZCBwYXJzZXIgdmVyc2lvbiBzbyBpdCBjYW4g YmUgcmVmZXJlbmNlZCBpbgpjb3JyZXNwb25kaW5nIGktZy10IGdlbV9leGVjX3BhcnNlIGNoYW5n ZXMuCgotLS0gPjggLS0tCgpCZWluZyBhYmxlIHRvIHByb2dyYW0gT0FDT05UUk9MIGZyb20gYSBu b24tcHJpdmlsZWdlZCBiYXRjaCBidWZmZXIgaXMKbm90IHN1ZmZpY2llbnQgdG8gYmUgYWJsZSB0 byBjb25maWd1cmUgdGhlIE9BIHVuaXQuIFRoaXMgd2FzIG9yaWdpbmFsbHkKYWxsb3dlZCB0byBo ZWxwIGVuYWJsZSBNZXNhIHRvIGV4cG9zZSBPQSBjb3VudGVycyB2aWEgdGhlCklOVEVMX3BlcmZv cm1hbmNlX3F1ZXJ5IGV4dGVuc2lvbiwgYnV0IHRoZSBjdXJyZW50IGltcGxlbWVudGF0aW9uIGJh c2VkCm9uIHByb2dyYW1taW5nIE9BQ09OVFJPTCB2aWEgYSBiYXRjaCBidWZmZXIgaXNuJ3QgYWJs ZSB0byByZXBvcnQgdXNlYWJsZQpkYXRhIHdpdGhvdXQgYSBtb3JlIGNvbXBsZXRlIE9BIHVuaXQg Y29uZmlndXJhdGlvbi4gTWVzYSBoYW5kbGVzIHRoZQpwb3NzaWJpbGl0eSB0aGF0IHdyaXRlcyB0 byBPQUNPTlRST0wgbWF5IG5vdCBiZSBhbGxvd2VkIGFuZCBzbyBvbmx5CmFkdmVydGlzZXMgdGhl IGV4dGVuc2lvbiBhZnRlciBleHBsaWNpdGx5IHRlc3RpbmcgdGhhdCBhIHdyaXRlIHRvCk9BQ09O VFJPTCBzdWNjZWVkcy4gQmFzZWQgb24gdGhpczsgcmVtb3ZpbmcgT0FDT05UUk9MIGZyb20gdGhl IHdoaXRlbGlzdApzaG91bGQgYmUgb2sgZm9yIHVzZXJzcGFjZS4KClJlbW92aW5nIHRoaXMgc2lt cGxpZmllcyBhZGRpbmcgYSBuZXcga2VybmVsIGFwaSBmb3IgY29uZmlndXJpbmcgdGhlIE9BCnVu aXQgd2l0aG91dCBuZWVkaW5nIHRvIGNvbnNpZGVyIHRoZSBwb3NzaWJpbGl0eSB0aGF0IHVzZXJz cGFjZSBtaWdodAp0cmFtcGxlIG9uIE9BQ09OVFJPTCBzdGF0ZSB3aGljaCB3ZSdkIGxpa2UgdG8g c3RhcnQgbWFuYWdpbmcgd2l0aGluCnRoZSBrZXJuZWwgaW5zdGVhZC4gSW4gcGFydGljdWxhciBy dW5uaW5nIGFueSBNZXNhIGJhc2VkIEdMIGFwcGxpY2F0aW9uCmN1cnJlbnRseSByZXN1bHRzIGlu IGNsZWFyaW5nIE9BQ09OVFJPTCB3aGVuIGluaXRpYWxpemluZyB3aGljaCB3b3VsZApkaXNhYmxl IHRoZSBjYXB0dXJpbmcgb2YgbWV0cmljcy4KCnYyOgogICAgVGhpcyBidW1wcyB0aGUgY29tbWFu ZCBwYXJzZXIgdmVyc2lvbiBmcm9tIDggdG8gOSwgYXMgdGhlIGNoYW5nZSBpcwogICAgdmlzaWJs ZSB0byB1c2Vyc3BhY2UuCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJvYmVydEBzaXhi eW5pbmUub3JnPgpSZXZpZXdlZC1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwu Y29tPgpSZXZpZXdlZC1ieTogU291cmFiIEd1cHRhIDxzb3VyYWIuZ3VwdGFAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jIHwgNDIgKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygr KSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9jbWRfcGFyc2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2NtZF9wYXJzZXIuYwpp bmRleCBjOWQyZWNkLi5mNTc2MmNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2NtZF9wYXJzZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2NtZF9wYXJz ZXIuYwpAQCAtNDUwLDcgKzQ1MCw2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcmVn X2Rlc2NyaXB0b3IgZ2VuN19yZW5kZXJfcmVnc1tdID0gewogCVJFRzY0KFBTX0lOVk9DQVRJT05f Q09VTlQpLAogCVJFRzY0KFBTX0RFUFRIX0NPVU5UKSwKIAlSRUc2NF9JRFgoUklOR19USU1FU1RB TVAsIFJFTkRFUl9SSU5HX0JBU0UpLAotCVJFRzMyKEdFTjdfT0FDT05UUk9MKSwgLyogT25seSBh bGxvd2VkIGZvciBMUkkgYW5kIFNSTS4gU2VlIGJlbG93LiAqLwogCVJFRzY0KE1JX1BSRURJQ0FU RV9TUkMwKSwKIAlSRUc2NChNSV9QUkVESUNBVEVfU1JDMSksCiAJUkVHMzIoR0VON18zRFBSSU1f RU5EX09GRlNFVCksCkBAIC0xMDYwLDggKzEwNTksNyBAQCBib29sIGludGVsX2VuZ2luZV9uZWVk c19jbWRfcGFyc2VyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHN0YXRpYyBib29s IGNoZWNrX2NtZChjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCSAgICAg IGNvbnN0IHN0cnVjdCBkcm1faTkxNV9jbWRfZGVzY3JpcHRvciAqZGVzYywKIAkJICAgICAgY29u c3QgdTMyICpjbWQsIHUzMiBsZW5ndGgsCi0JCSAgICAgIGNvbnN0IGJvb2wgaXNfbWFzdGVyLAot CQkgICAgICBib29sICpvYWNvbnRyb2xfc2V0KQorCQkgICAgICBjb25zdCBib29sIGlzX21hc3Rl cikKIHsKIAlpZiAoZGVzYy0+ZmxhZ3MgJiBDTURfREVTQ19TS0lQKQogCQlyZXR1cm4gdHJ1ZTsK QEAgLTEwOTksMzEgKzEwOTcsNiBAQCBzdGF0aWMgYm9vbCBjaGVja19jbWQoY29uc3Qgc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJfQogCiAJCQkvKgotCQkJICogT0FDT05UUk9M IHJlcXVpcmVzIHNvbWUgc3BlY2lhbCBoYW5kbGluZyBmb3IKLQkJCSAqIHdyaXRlcy4gV2Ugd2Fu dCB0byBtYWtlIHN1cmUgdGhhdCBhbnkgYmF0Y2ggd2hpY2gKLQkJCSAqIGVuYWJsZXMgT0EgYWxz byBkaXNhYmxlcyBpdCBiZWZvcmUgdGhlIGVuZCBvZiB0aGUKLQkJCSAqIGJhdGNoLiBUaGUgZ29h bCBpcyB0byBwcmV2ZW50IG9uZSBwcm9jZXNzIGZyb20KLQkJCSAqIHNub29waW5nIG9uIHRoZSBw ZXJmIGRhdGEgZnJvbSBhbm90aGVyIHByb2Nlc3MuIFRvIGRvCi0JCQkgKiB0aGF0LCB3ZSBuZWVk IHRvIGNoZWNrIHRoZSB2YWx1ZSB0aGF0IHdpbGwgYmUgd3JpdHRlbgotCQkJICogdG8gdGhlIHJl Z2lzdGVyLiBIZW5jZSwgbGltaXQgT0FDT05UUk9MIHdyaXRlcyB0bwotCQkJICogb25seSBNSV9M T0FEX1JFR0lTVEVSX0lNTSBjb21tYW5kcy4KLQkJCSAqLwotCQkJaWYgKHJlZ19hZGRyID09IGk5 MTVfbW1pb19yZWdfb2Zmc2V0KEdFTjdfT0FDT05UUk9MKSkgewotCQkJCWlmIChkZXNjLT5jbWQu dmFsdWUgPT0gTUlfTE9BRF9SRUdJU1RFUl9NRU0pIHsKLQkJCQkJRFJNX0RFQlVHX0RSSVZFUigi Q01EOiBSZWplY3RlZCBMUk0gdG8gT0FDT05UUk9MXG4iKTsKLQkJCQkJcmV0dXJuIGZhbHNlOwot CQkJCX0KLQotCQkJCWlmIChkZXNjLT5jbWQudmFsdWUgPT0gTUlfTE9BRF9SRUdJU1RFUl9SRUcp IHsKLQkJCQkJRFJNX0RFQlVHX0RSSVZFUigiQ01EOiBSZWplY3RlZCBMUlIgdG8gT0FDT05UUk9M XG4iKTsKLQkJCQkJcmV0dXJuIGZhbHNlOwotCQkJCX0KLQotCQkJCWlmIChkZXNjLT5jbWQudmFs dWUgPT0gTUlfTE9BRF9SRUdJU1RFUl9JTU0oMSkpCi0JCQkJCSpvYWNvbnRyb2xfc2V0ID0gKGNt ZFtvZmZzZXQgKyAxXSAhPSAwKTsKLQkJCX0KLQotCQkJLyoKIAkJCSAqIENoZWNrIHRoZSB2YWx1 ZSB3cml0dGVuIHRvIHRoZSByZWdpc3RlciBhZ2FpbnN0IHRoZQogCQkJICogYWxsb3dlZCBtYXNr L3ZhbHVlIHBhaXIgZ2l2ZW4gaW4gdGhlIHdoaXRlbGlzdCBlbnRyeS4KIAkJCSAqLwpAQCAtMTIx NCw3ICsxMTg3LDYgQEAgaW50IGludGVsX2VuZ2luZV9jbWRfcGFyc2VyKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSwKIAl1MzIgKmNtZCwgKmJhdGNoX2VuZDsKIAlzdHJ1Y3QgZHJtX2k5 MTVfY21kX2Rlc2NyaXB0b3IgZGVmYXVsdF9kZXNjID0gbm9vcF9kZXNjOwogCWNvbnN0IHN0cnVj dCBkcm1faTkxNV9jbWRfZGVzY3JpcHRvciAqZGVzYyA9ICZkZWZhdWx0X2Rlc2M7Ci0JYm9vbCBv YWNvbnRyb2xfc2V0ID0gZmFsc2U7IC8qIE9BQ09OVFJPTCB0cmFja2luZy4gU2VlIGNoZWNrX2Nt ZCgpICovCiAJYm9vbCBuZWVkc19jbGZsdXNoX2FmdGVyID0gZmFsc2U7CiAJaW50IHJldCA9IDA7 CiAKQEAgLTEyNzAsOCArMTI0Miw3IEBAIGludCBpbnRlbF9lbmdpbmVfY21kX3BhcnNlcihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQlicmVhazsKIAkJfQogCi0JCWlmICghY2hl Y2tfY21kKGVuZ2luZSwgZGVzYywgY21kLCBsZW5ndGgsIGlzX21hc3RlciwKLQkJCSAgICAgICAm b2Fjb250cm9sX3NldCkpIHsKKwkJaWYgKCFjaGVja19jbWQoZW5naW5lLCBkZXNjLCBjbWQsIGxl bmd0aCwgaXNfbWFzdGVyKSkgewogCQkJcmV0ID0gLUVBQ0NFUzsKIAkJCWJyZWFrOwogCQl9CkBA IC0xMjc5LDExICsxMjUwLDYgQEAgaW50IGludGVsX2VuZ2luZV9jbWRfcGFyc2VyKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJY21kICs9IGxlbmd0aDsKIAl9CiAKLQlpZiAob2Fj b250cm9sX3NldCkgewotCQlEUk1fREVCVUdfRFJJVkVSKCJDTUQ6IGJhdGNoIHNldCBPQUNPTlRS T0wgYnV0IGRpZCBub3QgY2xlYXIgaXRcbiIpOwotCQlyZXQgPSAtRUlOVkFMOwotCX0KLQogCWlm IChjbWQgPj0gYmF0Y2hfZW5kKSB7CiAJCURSTV9ERUJVR19EUklWRVIoIkNNRDogR290IHRvIHRo ZSBlbmQgb2YgdGhlIGJ1ZmZlciB3L28gYSBCQkUgY21kIVxuIik7CiAJCXJldCA9IC1FSU5WQUw7 CkBAIC0xMzM2LDYgKzEzMDIsOCBAQCBpbnQgaTkxNV9jbWRfcGFyc2VyX2dldF92ZXJzaW9uKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiA4LiBEb24ndCByZXBvcnQgY21k X2NoZWNrKCkgZmFpbHVyZXMgYXMgRUlOVkFMIGVycm9ycyB0byB1c2Vyc3BhY2U7CiAJICogICAg cmVseSBvbiB0aGUgSFcgdG8gTk9PUCBkaXNhbGxvd2VkIGNvbW1hbmRzIGFzIGl0IHdvdWxkIHdp dGhvdXQKIAkgKiAgICB0aGUgcGFyc2VyIGVuYWJsZWQuCisJICogOS4gRG9uJ3Qgd2hpdGVsaXN0 IG9yIGhhbmRsZSBvYWNvbnRyb2wgc3BlY2lhbGx5LCBhcyBvd25lcnNoaXAKKwkgKiAgICBmb3Ig b2Fjb250cm9sIHN0YXRlIGlzIG1vdmluZyB0byBpOTE1LXBlcmYuCiAJICovCi0JcmV0dXJuIDg7 CisJcmV0dXJuIDk7CiB9Ci0tIAoyLjEwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=