From: Keith Packard Subject: [PATCH 4/5] drm: Check mode object lease status in all master ioctl paths [v2] Date: Fri, 28 Apr 2017 23:07:01 -0700 Message-ID: <20170429060702.6656-5-keithp@keithp.com> References: <20170401170841.2643-1-keithp@keithp.com> <20170429060702.6656-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 4692A6E03C for ; Sat, 29 Apr 2017 06:07:08 +0000 (UTC) In-Reply-To: <20170429060702.6656-1-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, Dave Airlie , Daniel Vetter Cc: Keith Packard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QXR0ZW1wdHMgdG8gbW9kaWZ5IHVuLWxlYXNlZCBvYmplY3RzIGFyZSByZWplY3RlZCB3aXRoIGFu IGVycm9yLgpJbmZvcm1hdGlvbiByZXR1cm5lZCBhYm91dCB1bmxlYXNlZCBvYmplY3RzIGlzIG1v ZGlmaWVkIHRvIG1ha2UgdGhlbQphcHBlYXIgdW51c2FibGUgYW5kL29yIGRpc2Nvbm5lY3RlZC4K CkNoYW5nZXMgZm9yIHYyIGFzIHN1Z2dlc3RlZCBieSBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGZmd2xsLmNoPjoKCldpdGggdGhlIGNoYW5nZSBpbiB0aGUgX19kcm1fbW9kZV9vYmplY3Rf ZmluZCBBUEkgdG8gcGFzcyB0aGUKZmlsZV9wcml2IGFsb25nLCB3ZSBjYW4gbm93IGNlbnRyYWxp emUgbW9zdCBvZiB0aGUgbGVhc2UtYmFzZWQgYWNjZXNzCmNoZWNrcyBpbiB0aGF0IGZ1bmN0aW9u LgoKQSBmZXcgcGxhY2VzIHNraXAgdGhhdCBBUEkgYW5kIHJlcXVpcmUgaW4tbGluZSBjaGVja3Mu CgpTaWduZWQtb2ZmLWJ5OiBLZWl0aCBQYWNrYXJkIDxrZWl0aHBAa2VpdGhwLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vZHJtX2F1dGguYyAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2RybV9jb25uZWN0b3IuYyAgIHwgIDggKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2VuY29k ZXIuYyAgICAgfCAgOCArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcuYyB8 IDUyICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2RybV9tb2RlX29iamVjdC5jIHwgMjIgKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1 L2RybS9kcm1fcGxhbmUuYyAgICAgICB8ICA2ICsrKy0tCiA2IGZpbGVzIGNoYW5nZWQsIDY5IGlu c2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXV0aC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdXRoLmMKaW5kZXggMWRiNGY2Mzg2 MGQxLi40NGM5OWQxMmY0YzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXV0aC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXV0aC5jCkBAIC0zMDMsNyArMzAzLDcgQEAgdm9p ZCBkcm1fbWFzdGVyX3JlbGVhc2Uoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiAgKi8KIGJv b2wgZHJtX2lzX2N1cnJlbnRfbWFzdGVyKHN0cnVjdCBkcm1fZmlsZSAqZnByaXYpCiB7Ci0JcmV0 dXJuIGZwcml2LT5pc19tYXN0ZXIgJiYgZnByaXYtPm1hc3RlciA9PSBmcHJpdi0+bWlub3ItPmRl di0+bWFzdGVyOworCXJldHVybiBmcHJpdi0+aXNfbWFzdGVyICYmIGRybV9sZWFzZV9vd25lcihm cHJpdi0+bWFzdGVyKSA9PSBmcHJpdi0+bWlub3ItPmRldi0+bWFzdGVyOwogfQogRVhQT1JUX1NZ TUJPTChkcm1faXNfY3VycmVudF9tYXN0ZXIpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZHJtX2Nvbm5lY3Rvci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYwppbmRl eCA2NzBjMjBkNTY2MGMuLmRiZjM0ZjA4MzYzYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2RybV9jb25uZWN0b3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jCkBA IC0xMDk0LDcgKzEwOTQsOCBAQCBpbnQgZHJtX21vZGVfZ2V0Y29ubmVjdG9yKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJfQogCiAJZm9yIChpID0gMDsgaSA8IERSTV9DT05O RUNUT1JfTUFYX0VOQ09ERVI7IGkrKykKLQkJaWYgKGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNbaV0g IT0gMCkKKwkJaWYgKGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNbaV0gIT0gMCAmJgorCQkgICAgZHJt X2xlYXNlX2hlbGQoZmlsZV9wcml2LCBjb25uZWN0b3ItPmVuY29kZXJfaWRzW2ldKSkKIAkJCWVu Y29kZXJzX2NvdW50Kys7CiAKIAlpZiAob3V0X3Jlc3AtPmNvdW50X21vZGVzID09IDApIHsKQEAg LTExMTgsNyArMTExOSw3IEBAIGludCBkcm1fbW9kZV9nZXRjb25uZWN0b3Ioc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAogCWRybV9tb2Rlc2V0X2xvY2soJmRldi0+bW9kZV9j b25maWcuY29ubmVjdGlvbl9tdXRleCwgTlVMTCk7CiAJZW5jb2RlciA9IGRybV9jb25uZWN0b3Jf Z2V0X2VuY29kZXIoY29ubmVjdG9yKTsKLQlpZiAoZW5jb2RlcikKKwlpZiAoZW5jb2RlciAmJiBk cm1fbGVhc2VfaGVsZChmaWxlX3ByaXYsIGVuY29kZXItPmJhc2UuaWQpKQogCQlvdXRfcmVzcC0+ ZW5jb2Rlcl9pZCA9IGVuY29kZXItPmJhc2UuaWQ7CiAJZWxzZQogCQlvdXRfcmVzcC0+ZW5jb2Rl cl9pZCA9IDA7CkBAIC0xMTU2LDcgKzExNTcsOCBAQCBpbnQgZHJtX21vZGVfZ2V0Y29ubmVjdG9y KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCWNvcGllZCA9IDA7CiAJCWVu Y29kZXJfcHRyID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKShvdXRfcmVzcC0+ ZW5jb2RlcnNfcHRyKTsKIAkJZm9yIChpID0gMDsgaSA8IERSTV9DT05ORUNUT1JfTUFYX0VOQ09E RVI7IGkrKykgewotCQkJaWYgKGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNbaV0gIT0gMCkgeworCQkJ aWYgKGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNbaV0gIT0gMCAmJgorCQkJICAgIGRybV9sZWFzZV9o ZWxkKGZpbGVfcHJpdiwgY29ubmVjdG9yLT5lbmNvZGVyX2lkc1tpXSkpIHsKIAkJCQlpZiAocHV0 X3VzZXIoY29ubmVjdG9yLT5lbmNvZGVyX2lkc1tpXSwKIAkJCQkJICAgICBlbmNvZGVyX3B0ciAr IGNvcGllZCkpIHsKIAkJCQkJcmV0ID0gLUVGQVVMVDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZW5jb2Rlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9lbmNvZGVyLmMKaW5kZXgg ZGJhZWRkNGUxMmU2Li41MTJkMGI2Y2I3ZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fZW5jb2Rlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZW5jb2Rlci5jCkBAIC0yMTEs NyArMjExLDcgQEAgaW50IGRybV9tb2RlX2dldGVuY29kZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAogCWRybV9tb2Rlc2V0X2xvY2soJmRldi0+bW9kZV9jb25maWcuY29u bmVjdGlvbl9tdXRleCwgTlVMTCk7CiAJY3J0YyA9IGRybV9lbmNvZGVyX2dldF9jcnRjKGVuY29k ZXIpOwotCWlmIChjcnRjKQorCWlmIChjcnRjICYmIGRybV9sZWFzZV9oZWxkKGZpbGVfcHJpdiwg Y3J0Yy0+YmFzZS5pZCkpCiAJCWVuY19yZXNwLT5jcnRjX2lkID0gY3J0Yy0+YmFzZS5pZDsKIAll bHNlCiAJCWVuY19yZXNwLT5jcnRjX2lkID0gMDsKQEAgLTIxOSw4ICsyMTksMTAgQEAgaW50IGRy bV9tb2RlX2dldGVuY29kZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAog CWVuY19yZXNwLT5lbmNvZGVyX3R5cGUgPSBlbmNvZGVyLT5lbmNvZGVyX3R5cGU7CiAJZW5jX3Jl c3AtPmVuY29kZXJfaWQgPSBlbmNvZGVyLT5iYXNlLmlkOwotCWVuY19yZXNwLT5wb3NzaWJsZV9j cnRjcyA9IGVuY29kZXItPnBvc3NpYmxlX2NydGNzOwotCWVuY19yZXNwLT5wb3NzaWJsZV9jbG9u ZXMgPSBlbmNvZGVyLT5wb3NzaWJsZV9jbG9uZXM7CisJZW5jX3Jlc3AtPnBvc3NpYmxlX2NydGNz ID0gZHJtX2xlYXNlX2ZpbHRlcl9jcnRjcyhmaWxlX3ByaXYsCisJCQkJCQkJICBlbmNvZGVyLT5w b3NzaWJsZV9jcnRjcyk7CisJZW5jX3Jlc3AtPnBvc3NpYmxlX2Nsb25lcyA9IGRybV9sZWFzZV9m aWx0ZXJfZW5jb2RlcnMoZmlsZV9wcml2LAorCQkJCQkJCSAgICAgIGVuY29kZXItPnBvc3NpYmxl X2Nsb25lcyk7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fbW9kZV9jb25maWcuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcuYwppbmRl eCAyNzM1YTU4NDdmZmEuLmJiNmI2NGU1OTRiNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2RybV9tb2RlX2NvbmZpZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcu YwpAQCAtMTMxLDE0ICsxMzEsMjAgQEAgaW50IGRybV9tb2RlX2dldHJlc291cmNlcyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCS8qIG1vZGVfY29uZmlnLm11dGV4IHByb3Rl Y3RzIHRoZSBjb25uZWN0b3IgbGlzdCBhZ2FpbnN0IGUuZy4gRFAgTVNUCiAJICogY29ubmVjdG9y IGhvdC1hZGRpbmcuIENSVEMvUGxhbmUgbGlzdHMgYXJlIGludmFyaWFudC4gKi8KIAltdXRleF9s b2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKLQlkcm1fZm9yX2VhY2hfY3J0YyhjcnRjLCBk ZXYpCi0JCWNydGNfY291bnQrKzsKKwlkcm1fZm9yX2VhY2hfY3J0YyhjcnRjLCBkZXYpIHsKKwkJ aWYgKGRybV9sZWFzZV9oZWxkKGZpbGVfcHJpdiwgY3J0Yy0+YmFzZS5pZCkpCisJCQljcnRjX2Nv dW50Kys7CisJfQogCi0JZHJtX2Zvcl9lYWNoX2Nvbm5lY3Rvcihjb25uZWN0b3IsIGRldikKLQkJ Y29ubmVjdG9yX2NvdW50Kys7CisJZHJtX2Zvcl9lYWNoX2Nvbm5lY3Rvcihjb25uZWN0b3IsIGRl dikgeworCQlpZiAoZHJtX2xlYXNlX2hlbGQoZmlsZV9wcml2LCBjb25uZWN0b3ItPmJhc2UuaWQp KQorCQkJY29ubmVjdG9yX2NvdW50Kys7CisJfQogCi0JZHJtX2Zvcl9lYWNoX2VuY29kZXIoZW5j b2RlciwgZGV2KQotCQllbmNvZGVyX2NvdW50Kys7CisJZHJtX2Zvcl9lYWNoX2VuY29kZXIoZW5j b2RlciwgZGV2KSB7CisJCWlmIChkcm1fbGVhc2VfaGVsZChmaWxlX3ByaXYsIGVuY29kZXItPmJh c2UuaWQpKQorCQkJZW5jb2Rlcl9jb3VudCsrOworCX0KIAogCWNhcmRfcmVzLT5tYXhfaGVpZ2h0 ID0gZGV2LT5tb2RlX2NvbmZpZy5tYXhfaGVpZ2h0OwogCWNhcmRfcmVzLT5taW5faGVpZ2h0ID0g ZGV2LT5tb2RlX2NvbmZpZy5taW5faGVpZ2h0OwpAQCAtMTUwLDExICsxNTYsMTMgQEAgaW50IGRy bV9tb2RlX2dldHJlc291cmNlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAog CQljb3BpZWQgPSAwOwogCQljcnRjX2lkID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBs b25nKWNhcmRfcmVzLT5jcnRjX2lkX3B0cjsKIAkJZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2 KSB7Ci0JCQlpZiAocHV0X3VzZXIoY3J0Yy0+YmFzZS5pZCwgY3J0Y19pZCArIGNvcGllZCkpIHsK LQkJCQlyZXQgPSAtRUZBVUxUOwotCQkJCWdvdG8gb3V0OworCQkJaWYgKGRybV9sZWFzZV9oZWxk KGZpbGVfcHJpdiwgY3J0Yy0+YmFzZS5pZCkpIHsKKwkJCQlpZiAocHV0X3VzZXIoY3J0Yy0+YmFz ZS5pZCwgY3J0Y19pZCArIGNvcGllZCkpIHsKKwkJCQkJcmV0ID0gLUVGQVVMVDsKKwkJCQkJZ290 byBvdXQ7CisJCQkJfQorCQkJCWNvcGllZCsrOwogCQkJfQotCQkJY29waWVkKys7CiAJCX0KIAl9 CiAJY2FyZF9yZXMtPmNvdW50X2NydGNzID0gY3J0Y19jb3VudDsKQEAgLTE2NCwxMiArMTcyLDE0 IEBAIGludCBkcm1fbW9kZV9nZXRyZXNvdXJjZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9p ZCAqZGF0YSwKIAkJY29waWVkID0gMDsKIAkJZW5jb2Rlcl9pZCA9ICh1aW50MzJfdCBfX3VzZXIg KikodW5zaWduZWQgbG9uZyljYXJkX3Jlcy0+ZW5jb2Rlcl9pZF9wdHI7CiAJCWRybV9mb3JfZWFj aF9lbmNvZGVyKGVuY29kZXIsIGRldikgewotCQkJaWYgKHB1dF91c2VyKGVuY29kZXItPmJhc2Uu aWQsIGVuY29kZXJfaWQgKwotCQkJCSAgICAgY29waWVkKSkgewotCQkJCXJldCA9IC1FRkFVTFQ7 Ci0JCQkJZ290byBvdXQ7CisJCQlpZiAoZHJtX2xlYXNlX2hlbGQoZmlsZV9wcml2LCBlbmNvZGVy LT5iYXNlLmlkKSkgeworCQkJCWlmIChwdXRfdXNlcihlbmNvZGVyLT5iYXNlLmlkLCBlbmNvZGVy X2lkICsKKwkJCQkJICAgICBjb3BpZWQpKSB7CisJCQkJCXJldCA9IC1FRkFVTFQ7CisJCQkJCWdv dG8gb3V0OworCQkJCX0KKwkJCQljb3BpZWQrKzsKIAkJCX0KLQkJCWNvcGllZCsrOwogCQl9CiAJ fQogCWNhcmRfcmVzLT5jb3VudF9lbmNvZGVycyA9IGVuY29kZXJfY291bnQ7CkBAIC0xNzksMTIg KzE4OSwxNCBAQCBpbnQgZHJtX21vZGVfZ2V0cmVzb3VyY2VzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHZvaWQgKmRhdGEsCiAJCWNvcGllZCA9IDA7CiAJCWNvbm5lY3Rvcl9pZCA9ICh1aW50MzJf dCBfX3VzZXIgKikodW5zaWduZWQgbG9uZyljYXJkX3Jlcy0+Y29ubmVjdG9yX2lkX3B0cjsKIAkJ ZHJtX2Zvcl9lYWNoX2Nvbm5lY3Rvcihjb25uZWN0b3IsIGRldikgewotCQkJaWYgKHB1dF91c2Vy KGNvbm5lY3Rvci0+YmFzZS5pZCwKLQkJCQkgICAgIGNvbm5lY3Rvcl9pZCArIGNvcGllZCkpIHsK LQkJCQlyZXQgPSAtRUZBVUxUOwotCQkJCWdvdG8gb3V0OworCQkJaWYgKGRybV9sZWFzZV9oZWxk KGZpbGVfcHJpdiwgY29ubmVjdG9yLT5iYXNlLmlkKSkgeworCQkJCWlmIChwdXRfdXNlcihjb25u ZWN0b3ItPmJhc2UuaWQsCisJCQkJCSAgICAgY29ubmVjdG9yX2lkICsgY29waWVkKSkgeworCQkJ CQlyZXQgPSAtRUZBVUxUOworCQkJCQlnb3RvIG91dDsKKwkJCQl9CisJCQkJY29waWVkKys7CiAJ CQl9Ci0JCQljb3BpZWQrKzsKIAkJfQogCX0KIAljYXJkX3Jlcy0+Y291bnRfY29ubmVjdG9ycyA9 IGNvbm5lY3Rvcl9jb3VudDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9v YmplY3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9vYmplY3QuYwppbmRleCBkYWRkYzc2 NDAxMzkuLjk3NjM3ODc0OTJjYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rl X29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9vYmplY3QuYwpAQCAtMTA3 LDYgKzEwNywyNSBAQCB2b2lkIGRybV9tb2RlX29iamVjdF91bnJlZ2lzdGVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmlkcl9tdXRleCk7 CiB9CiAKKy8qKgorICogZHJtX2xlYXNlX3JlcXVpcmVkIC0gY2hlY2sgdHlwZXMgd2hpY2ggbXVz dCBiZSBsZWFzZWQgdG8gYmUgdXNlZAorICogQHR5cGU6IHR5cGUgb2Ygb2JqZWN0CisgKgorICog UmV0dXJucyB3aGV0aGVyIHRoZSBwcm92aWRlZCB0eXBlIG9mIGRybV9tb2RlX29iamVjdCBtdXN0 CisgKiBiZSBvd25lZCBvciBsZWFzZWQgdG8gYmUgdXNlZCBieSBhIHByb2Nlc3MuCisgKi8KK3N0 YXRpYyBib29sIGRybV9sZWFzZV9yZXF1aXJlZCh1aW50MzJfdCB0eXBlKQoreworCXN3aXRjaCh0 eXBlKSB7CisJY2FzZSBEUk1fTU9ERV9PQkpFQ1RfQ1JUQzoKKwljYXNlIERSTV9NT0RFX09CSkVD VF9DT05ORUNUT1I6CisJY2FzZSBEUk1fTU9ERV9PQkpFQ1RfRU5DT0RFUjoKKwkJcmV0dXJuIHRy dWU7CisJZGVmYXVsdDoKKwkJcmV0dXJuIGZhbHNlOworCX0KK30KKwogc3RydWN0IGRybV9tb2Rl X29iamVjdCAqX19kcm1fbW9kZV9vYmplY3RfZmluZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CQkJCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsCiAJCQkJCSAgICAgICB1aW50 MzJfdCBpZCwgdWludDMyX3QgdHlwZSkKQEAgLTEyMCw2ICsxMzksOSBAQCBzdHJ1Y3QgZHJtX21v ZGVfb2JqZWN0ICpfX2RybV9tb2RlX29iamVjdF9maW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJaWYgKG9iaiAmJiBvYmotPmlkICE9IGlkKQogCQlvYmogPSBOVUxMOwogCisJaWYgKG9iaiAm JiBkcm1fbGVhc2VfcmVxdWlyZWQob2JqLT50eXBlKSAmJiAhX2RybV9sZWFzZV9oZWxkKGZpbGVf cHJpdiwgb2JqLT5pZCkpCisJCW9iaiA9IE5VTEw7CisKIAlpZiAob2JqICYmIG9iai0+ZnJlZV9j YikgewogCQlpZiAoIWtyZWZfZ2V0X3VubGVzc196ZXJvKCZvYmotPnJlZmNvdW50KSkKIAkJCW9i aiA9IE5VTEw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMKaW5kZXggODE5Zjc0NjE2ZjM0Li5jOWM2ODdjZGM3NDcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX3BsYW5lLmMKQEAgLTM5Miw3ICszOTIsNyBAQCBpbnQgZHJtX21vZGVfZ2V0cGxh bmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJcmV0dXJuIC1FTk9FTlQ7 CiAKIAlkcm1fbW9kZXNldF9sb2NrKCZwbGFuZS0+bXV0ZXgsIE5VTEwpOwotCWlmIChwbGFuZS0+ Y3J0YykKKwlpZiAocGxhbmUtPmNydGMgJiYgZHJtX2xlYXNlX2hlbGQoZmlsZV9wcml2LCBwbGFu ZS0+Y3J0Yy0+YmFzZS5pZCkpCiAJCXBsYW5lX3Jlc3AtPmNydGNfaWQgPSBwbGFuZS0+Y3J0Yy0+ YmFzZS5pZDsKIAllbHNlCiAJCXBsYW5lX3Jlc3AtPmNydGNfaWQgPSAwOwpAQCAtNDA0LDcgKzQw NCw5IEBAIGludCBkcm1fbW9kZV9nZXRwbGFuZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lk ICpkYXRhLAogCWRybV9tb2Rlc2V0X3VubG9jaygmcGxhbmUtPm11dGV4KTsKIAogCXBsYW5lX3Jl c3AtPnBsYW5lX2lkID0gcGxhbmUtPmJhc2UuaWQ7Ci0JcGxhbmVfcmVzcC0+cG9zc2libGVfY3J0 Y3MgPSBwbGFuZS0+cG9zc2libGVfY3J0Y3M7CisJcGxhbmVfcmVzcC0+cG9zc2libGVfY3J0Y3Mg PSBkcm1fbGVhc2VfZmlsdGVyX2NydGNzKGZpbGVfcHJpdiwKKwkJCQkJCQkgICAgcGxhbmUtPnBv c3NpYmxlX2NydGNzKTsKKwogCXBsYW5lX3Jlc3AtPmdhbW1hX3NpemUgPSAwOwogCiAJLyoKLS0g CjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==