From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBS1C-0004gZ-6C for barebox@lists.infradead.org; Thu, 06 Feb 2014 16:41:40 +0000 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 6 Feb 2014 17:40:52 +0100 Message-Id: <1391704854-3141-8-git-send-email-u.kleine-koenig@pengutronix.de> In-Reply-To: <1391704854-3141-1-git-send-email-u.kleine-koenig@pengutronix.de> References: <1391704854-3141-1-git-send-email-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 7/9] mount: support filesystem options passed via -o To: barebox@lists.infradead.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= RnJvbTogVXdlIEtsZWluZS1Lw7ZuaWcgPHV3ZUBrbGVpbmUta29lbmlnLm9yZz4KClNpbWlsYXIg dG8gbW91bnQoOCkgdGhlIGJhcmVib3ggY29tbWFuZCBtb3VudCBub3cgc3VwcG9ydHMgcGFzc2lu ZyBhIHN0cmluZwp0byB0aGUgZmlsZSBzeXN0ZW0gZHJpdmVyIHZpYSAtby4KClRoaXMgaXMgdXNl ZCBpbiBvbiBvZiB0aGUgbmV4dCBjb21taXRzIHRvIGxldCB0aGUgdXNlciBzcGVjaWZ5IHBvcnQg bnVtYmVycwpmb3IgbmZzIG1vdW50cy4KClNpZ25lZC1vZmYtYnk6IFV3ZSBLbGVpbmUtS8O2bmln IDx1LmtsZWluZS1rb2VuaWdAcGVuZ3V0cm9uaXguZGU+Ci0tLQogYXJjaC9hcm0vYm9hcmRzL3Jh c3BiZXJyeS1waS9ycGkuYyB8ICAyICstCiBhcmNoL2FybS9tYWNoLW9tYXAvb21hcF9nZW5lcmlj LmMgIHwgIDIgKy0KIGFyY2gvYXJtL21hY2gtb21hcC94bG9hZC5jICAgICAgICAgfCAgNCArKy0t CiBhcmNoL2FybS9tYWNoLXNvY2ZwZ2EvZ2VuZXJpYy5jICAgIHwgIDIgKy0KIGNvbW1hbmRzL21v dW50LmMgICAgICAgICAgICAgICAgICAgfCAxOSArKysrKysrKysrKystLS0tLS0tCiBjb21tYW5k cy90ZnRwLmMgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIGNvbW1vbi9ibHNwZWMuYyAgICAg ICAgICAgICAgICAgICAgfCAgMiArLQogY29tbW9uL3N0YXJ0dXAuYyAgICAgICAgICAgICAgICAg ICB8ICA0ICsrLS0KIGZzL2ZzLmMgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxOSArKysr KysrKysrKysrLS0tLS0tCiBpbmNsdWRlL2ZzLmggICAgICAgICAgICAgICAgICAgICAgIHwgIDYg KysrKy0tCiBsaWIvYm9vdHN0cmFwL2Rpc2suYyAgICAgICAgICAgICAgIHwgIDIgKy0KIDExIGZp bGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2FyY2gvYXJtL2JvYXJkcy9yYXNwYmVycnktcGkvcnBpLmMgYi9hcmNoL2FybS9ib2FyZHMv cmFzcGJlcnJ5LXBpL3JwaS5jCmluZGV4IDA5OTcxMjRjMDFlYy4uMDNhMTZkNzU2MTlkIDEwMDY0 NAotLS0gYS9hcmNoL2FybS9ib2FyZHMvcmFzcGJlcnJ5LXBpL3JwaS5jCisrKyBiL2FyY2gvYXJt L2JvYXJkcy9yYXNwYmVycnktcGkvcnBpLmMKQEAgLTEyNiw3ICsxMjYsNyBAQCBzdGF0aWMgaW50 IHJwaV9lbnZfaW5pdCh2b2lkKQogCX0KIAogCW1rZGlyKCIvYm9vdCIsIDA2NjYpOwotCXJldCA9 IG1vdW50KGRpc2tkZXYsICJmYXQiLCAiL2Jvb3QiKTsKKwlyZXQgPSBtb3VudChkaXNrZGV2LCAi ZmF0IiwgIi9ib290IiwgTlVMTCk7CiAJaWYgKHJldCkgewogCQlwcmludGYoImZhaWxlZCB0byBt b3VudCAlc1xuIiwgZGlza2Rldik7CiAJCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0v bWFjaC1vbWFwL29tYXBfZ2VuZXJpYy5jIGIvYXJjaC9hcm0vbWFjaC1vbWFwL29tYXBfZ2VuZXJp Yy5jCmluZGV4IGJlZGI0ZDhkMjYxOC4uMDYwYzU5Mjc3ZjRlIDEwMDY0NAotLS0gYS9hcmNoL2Fy bS9tYWNoLW9tYXAvb21hcF9nZW5lcmljLmMKKysrIGIvYXJjaC9hcm0vbWFjaC1vbWFwL29tYXBf Z2VuZXJpYy5jCkBAIC0xMzYsNyArMTM2LDcgQEAgc3RhdGljIGludCBvbWFwX2Vudl9pbml0KHZv aWQpCiAJfQogCiAJbWtkaXIoIi9ib290IiwgMDY2Nik7Ci0JcmV0ID0gbW91bnQoZGlza2Rldiwg ImZhdCIsICIvYm9vdCIpOworCXJldCA9IG1vdW50KGRpc2tkZXYsICJmYXQiLCAiL2Jvb3QiLCBO VUxMKTsKIAlpZiAocmV0KSB7CiAJCXByaW50ZigiZmFpbGVkIHRvIG1vdW50ICVzXG4iLCBkaXNr ZGV2KTsKIAkJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLW9tYXAveGxvYWQu YyBiL2FyY2gvYXJtL21hY2gtb21hcC94bG9hZC5jCmluZGV4IDY5ZTNlNDJkZjY5ZC4uYTMwOTQ1 MDEwOTkwIDEwMDY0NAotLS0gYS9hcmNoL2FybS9tYWNoLW9tYXAveGxvYWQuYworKysgYi9hcmNo L2FybS9tYWNoLW9tYXAveGxvYWQuYwpAQCAtMTEwLDcgKzExMCw3IEBAIHN0YXRpYyB2b2lkICpv bWFwX3hsb2FkX2Jvb3RfbW1jKHZvaWQpCiAKIAlwYXJ0bmFtZSA9IGFzcHJpbnRmKCIlcy4wIiwg ZGlza2Rldik7CiAKLQlyZXQgPSBtb3VudChwYXJ0bmFtZSwgImZhdCIsICIvIik7CisJcmV0ID0g bW91bnQocGFydG5hbWUsICJmYXQiLCAiLyIsIE5VTEwpOwogCiAJZnJlZShwYXJ0bmFtZSk7CiAK QEAgLTE3MCw3ICsxNzAsNyBAQCBzdGF0aWMgdm9pZCAqb21hcDRfeGxvYWRfYm9vdF91c2Iodm9p ZCl7CiAJdm9pZCAqYnVmOwogCWludCBsZW47CiAKLQlyZXQgPSBtb3VudCgib21hcDRfdXNiYm9v dCIsICJvbWFwNF91c2Jib290ZnMiLCAiLyIpOworCXJldCA9IG1vdW50KCJvbWFwNF91c2Jib290 IiwgIm9tYXA0X3VzYmJvb3RmcyIsICIvIiwgTlVMTCk7CiAJaWYgKHJldCkgewogCQlwcmludGYo IlVuYWJsZSB0byBtb3VudCBvbWFwNF91c2Jib290ZnMgKCVkKVxuIiwgcmV0KTsKIAkJcmV0dXJu IE5VTEw7CmRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLXNvY2ZwZ2EvZ2VuZXJpYy5jIGIvYXJj aC9hcm0vbWFjaC1zb2NmcGdhL2dlbmVyaWMuYwppbmRleCAwZDk1OGQyM2FmNjAuLjYyNTkzNTQ5 ZDZlNCAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vbWFjaC1zb2NmcGdhL2dlbmVyaWMuYworKysgYi9h cmNoL2FybS9tYWNoLXNvY2ZwZ2EvZ2VuZXJpYy5jCkBAIC05Nyw3ICs5Nyw3IEBAIHN0YXRpYyBp bnQgc29jZnBnYV9lbnZfaW5pdCh2b2lkKQogCX0KIAogCW1rZGlyKCIvYm9vdCIsIDA2NjYpOwot CXJldCA9IG1vdW50KHBhcnRuYW1lLCAiZmF0IiwgIi9ib290Iik7CisJcmV0ID0gbW91bnQocGFy dG5hbWUsICJmYXQiLCAiL2Jvb3QiLCBOVUxMKTsKIAlpZiAocmV0KSB7CiAJCXByaW50ZigiZmFp bGVkIHRvIG1vdW50ICVzXG4iLCBkaXNrZGV2KTsKIAkJZ290byBvdXRfZnJlZTsKZGlmZiAtLWdp dCBhL2NvbW1hbmRzL21vdW50LmMgYi9jb21tYW5kcy9tb3VudC5jCmluZGV4IDJlOWQ0YmVmNWUz Zi4uNjkxYmMyOTExZThmIDEwMDY0NAotLS0gYS9jb21tYW5kcy9tb3VudC5jCisrKyBiL2NvbW1h bmRzL21vdW50LmMKQEAgLTMzLDI2ICszMywzMSBAQCBzdGF0aWMgaW50IGRvX21vdW50KGludCBh cmdjLCBjaGFyICphcmd2W10pCiB7CiAJaW50IG9wdDsKIAlpbnQgcmV0ID0gMCwgdmVyYm9zZSA9 IDA7Ci0Jc3RydWN0IGZzX2RldmljZV9kICpmc2RldjsKIAlzdHJ1Y3QgZHJpdmVyX2QgKmRydjsK IAljb25zdCBjaGFyICp0eXBlID0gTlVMTDsKIAljb25zdCBjaGFyICptb3VudHBvaW50LCAqZGV2 OworCWNvbnN0IGNoYXIgKmZzb3B0aW9ucyA9IE5VTEw7CiAKLQl3aGlsZSAoKG9wdCA9IGdldG9w dChhcmdjLCBhcmd2LCAidDp2YSIpKSA+IDApIHsKKwl3aGlsZSAoKG9wdCA9IGdldG9wdChhcmdj LCBhcmd2LCAiYW86dDp2IikpID4gMCkgewogCQlzd2l0Y2ggKG9wdCkgeworCQljYXNlICdhJzoK KwkJCW1vdW50X2FsbCgpOworCQkJYnJlYWs7CiAJCWNhc2UgJ3QnOgogCQkJdHlwZSA9IG9wdGFy ZzsKIAkJCWJyZWFrOworCQljYXNlICdvJzoKKwkJCWZzb3B0aW9ucyA9IG9wdGFyZzsKKwkJCWJy ZWFrOwogCQljYXNlICd2JzoKIAkJCXZlcmJvc2UrKzsKIAkJCWJyZWFrOwotCQljYXNlICdhJzoK LQkJCW1vdW50X2FsbCgpOwotCQkJYnJlYWs7CiAJCX0KIAl9CiAKIAlpZiAoYXJnYyA9PSBvcHRp bmQpIHsKKwkJc3RydWN0IGZzX2RldmljZV9kICpmc2RldjsKKwogCQlmb3JfZWFjaF9mc19kZXZp Y2UoZnNkZXYpIHsKIAkJCXByaW50ZigiJXMgb24gJXMgdHlwZSAlc1xuIiwKIAkJCQlmc2Rldi0+ YmFja2luZ3N0b3JlID8gZnNkZXYtPmJhY2tpbmdzdG9yZSA6ICJub25lIiwKQEAgLTg0LDcgKzg5 LDcgQEAgc3RhdGljIGludCBkb19tb3VudChpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQlpZiAo IWNkZXYpCiAJCQlyZXR1cm4gLUVOT0VOVDsKIAotCQlwYXRoID0gY2Rldl9tb3VudF9kZWZhdWx0 KGNkZXYpOworCQlwYXRoID0gY2Rldl9tb3VudF9kZWZhdWx0KGNkZXYsIGZzb3B0aW9ucyk7CiAJ CWlmIChJU19FUlIocGF0aCkpCiAJCQlyZXR1cm4gUFRSX0VSUihwYXRoKTsKIApAQCAtMTA4LDcg KzExMyw3IEBAIHN0YXRpYyBpbnQgZG9fbW91bnQoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJ bW91bnRwb2ludCA9IGFyZ3Zbb3B0aW5kICsgMV07CiAJfQogCi0JaWYgKChyZXQgPSBtb3VudChk ZXYsIHR5cGUsIG1vdW50cG9pbnQpKSkgeworCWlmICgocmV0ID0gbW91bnQoZGV2LCB0eXBlLCBt b3VudHBvaW50LCBmc29wdGlvbnMpKSkgewogCQlwZXJyb3IoIm1vdW50Iik7CiAJCXJldHVybiAx OwogCX0KZGlmZiAtLWdpdCBhL2NvbW1hbmRzL3RmdHAuYyBiL2NvbW1hbmRzL3RmdHAuYwppbmRl eCBjODNkMTc0MGUyZjAuLjY0Y2FiMmYwNDUxZCAxMDA2NDQKLS0tIGEvY29tbWFuZHMvdGZ0cC5j CisrKyBiL2NvbW1hbmRzL3RmdHAuYwpAQCAtNzIsNyArNzIsNyBAQCBzdGF0aWMgaW50IGRvX3Rm dHBiKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCWdvdG8gZXJyX2ZyZWU7CiAKIAlpcCA9IG5l dF9nZXRfc2VydmVyaXAoKTsKLQlyZXQgPSBtb3VudChpcF90b19zdHJpbmcoaXApLCAidGZ0cCIs IFRGVFBfTU9VTlRfUEFUSCk7CisJcmV0ID0gbW91bnQoaXBfdG9fc3RyaW5nKGlwKSwgInRmdHAi LCBURlRQX01PVU5UX1BBVEgsIE5VTEwpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3JtZGlyOwog CmRpZmYgLS1naXQgYS9jb21tb24vYmxzcGVjLmMgYi9jb21tb24vYmxzcGVjLmMKaW5kZXggMjI0 NGQ1YThhODY4Li5kZjNjOWMzYzY1ZGEgMTAwNjQ0Ci0tLSBhL2NvbW1vbi9ibHNwZWMuYworKysg Yi9jb21tb24vYmxzcGVjLmMKQEAgLTI3Niw3ICsyNzYsNyBAQCBzdGF0aWMgaW50IGJsc3BlY19z Y2FuX2NkZXYoc3RydWN0IGJsc3BlYyAqYmxzcGVjLCBzdHJ1Y3QgY2RldiAqY2RldikKIAlpZiAo dHlwZSA9PSBmaWxldHlwZV9tYnIgfHwgdHlwZSA9PSBmaWxldHlwZV9ncHQpCiAJCXJldHVybiAt RUlOVkFMOwogCi0Jcm9vdHBhdGggPSBjZGV2X21vdW50X2RlZmF1bHQoY2Rldik7CisJcm9vdHBh dGggPSBjZGV2X21vdW50X2RlZmF1bHQoY2RldiwgTlVMTCk7CiAJaWYgKElTX0VSUihyb290cGF0 aCkpCiAJCXJldHVybiBQVFJfRVJSKHJvb3RwYXRoKTsKIApkaWZmIC0tZ2l0IGEvY29tbW9uL3N0 YXJ0dXAuYyBiL2NvbW1vbi9zdGFydHVwLmMKaW5kZXggZThiOWVhMDIxNmZlLi4wYjVmZTQ2YWRi NTAgMTAwNjQ0Ci0tLSBhL2NvbW1vbi9zdGFydHVwLmMKKysrIGIvY29tbW9uL3N0YXJ0dXAuYwpA QCAtODksOSArODksOSBAQCBkZXZpY2VfaW5pdGNhbGwocmVnaXN0ZXJfZGVmYXVsdF9lbnYpOwog I2lmIGRlZmluZWQgQ09ORklHX0ZTX1JBTUZTICYmIGRlZmluZWQgQ09ORklHX0ZTX0RFVkZTCiBz dGF0aWMgaW50IG1vdW50X3Jvb3Qodm9pZCkKIHsKLQltb3VudCgibm9uZSIsICJyYW1mcyIsICIv Iik7CisJbW91bnQoIm5vbmUiLCAicmFtZnMiLCAiLyIsIE5VTEwpOwogCW1rZGlyKCIvZGV2Iiwg MCk7Ci0JbW91bnQoIm5vbmUiLCAiZGV2ZnMiLCAiL2RldiIpOworCW1vdW50KCJub25lIiwgImRl dmZzIiwgIi9kZXYiLCBOVUxMKTsKIAlyZXR1cm4gMDsKIH0KIGZzX2luaXRjYWxsKG1vdW50X3Jv b3QpOwpkaWZmIC0tZ2l0IGEvZnMvZnMuYyBiL2ZzL2ZzLmMKaW5kZXggMzJkYmE4Y2YwYWJlLi43 YTU3YmMwNjcwYmMgMTAwNjQ0Ci0tLSBhL2ZzL2ZzLmMKKysrIGIvZnMvZnMuYwpAQCAtMTI0Miw2 ICsxMjQyLDcgQEAgc3RhdGljIHZvaWQgZnNfcmVtb3ZlKHN0cnVjdCBkZXZpY2VfZCAqZGV2KQog CX0KIAogCWZyZWUoZnNkZXYtPnBhdGgpOworCWZyZWUoZnNkZXYtPm9wdGlvbnMpOwogCiAJaWYg KGZzZGV2ID09IGZzX2Rldl9yb290KQogCQlmc19kZXZfcm9vdCA9IE5VTEw7CkBAIC0xMzE2LDEz ICsxMzE3LDE4IEBAIGludCBmc2Rldl9vcGVuX2NkZXYoc3RydWN0IGZzX2RldmljZV9kICpmc2Rl dikKICAqIFdlIGRvIHRoaXMgYnkgcmVnaXN0ZXJpbmcgYSBuZXcgZGV2aWNlIG9uIHdoaWNoIHRo ZSBmaWxlc3lzdGVtCiAgKiBkcml2ZXIgd2lsbCBtYXRjaC4KICAqLwotaW50IG1vdW50KGNvbnN0 IGNoYXIgKmRldmljZSwgY29uc3QgY2hhciAqZnNuYW1lLCBjb25zdCBjaGFyICpfcGF0aCkKK2lu dCBtb3VudChjb25zdCBjaGFyICpkZXZpY2UsIGNvbnN0IGNoYXIgKmZzbmFtZSwgY29uc3QgY2hh ciAqX3BhdGgsCisJCWNvbnN0IGNoYXIgKmZzb3B0aW9ucykKIHsKIAlzdHJ1Y3QgZnNfZGV2aWNl X2QgKmZzZGV2OwogCWludCByZXQ7CiAJY2hhciAqcGF0aCA9IG5vcm1hbGlzZV9wYXRoKF9wYXRo KTsKIAotCWRlYnVnKCJtb3VudDogJXMgb24gJXMgdHlwZSAlc1xuIiwgZGV2aWNlLCBwYXRoLCBm c25hbWUpOworCWlmICghZnNvcHRpb25zKQorCQlmc29wdGlvbnMgPSAiIjsKKworCWRlYnVnKCJt b3VudDogJXMgb24gJXMgdHlwZSAlcywgb3B0aW9ucz0lc1xuIiwKKwkJCWRldmljZSwgcGF0aCwg ZnNuYW1lLCBmc29wdGlvbnMpOwogCiAJaWYgKGZzX2Rldl9yb290KSB7CiAJCWZzZGV2ID0gZ2V0 X2ZzZGV2aWNlX2J5X3BhdGgocGF0aCk7CkBAIC0xMzU0LDYgKzEzNjAsNyBAQCBpbnQgbW91bnQo Y29uc3QgY2hhciAqZGV2aWNlLCBjb25zdCBjaGFyICpmc25hbWUsIGNvbnN0IGNoYXIgKl9wYXRo KQogCWZzZGV2LT5kZXYuaWQgPSBnZXRfZnJlZV9kZXZpY2VpZChmc2Rldi0+ZGV2Lm5hbWUpOwog CWZzZGV2LT5wYXRoID0geHN0cmR1cChwYXRoKTsKIAlmc2Rldi0+ZGV2LmJ1cyA9ICZmc19idXM7 CisJZnNkZXYtPm9wdGlvbnMgPSB4c3RyZHVwKGZzb3B0aW9ucyk7CiAKIAlyZXQgPSByZWdpc3Rl cl9kZXZpY2UoJmZzZGV2LT5kZXYpOwogCWlmIChyZXQpCkBAIC0xNzExLDcgKzE3MTgsNyBAQCBj b25zdCBjaGFyICpjZGV2X2dldF9tb3VudF9wYXRoKHN0cnVjdCBjZGV2ICpjZGV2KQogICogbW91 bnQgaXQgdG8gL21udC88Y2Rldm5hbWU+IGFuZCByZXR1cm4gdGhlIHBhdGguIFJldHVybnMgYW4g ZXJyb3IgcG9pbnRlcgogICogb24gZmFpbHVyZS4KICAqLwotY29uc3QgY2hhciAqY2Rldl9tb3Vu dF9kZWZhdWx0KHN0cnVjdCBjZGV2ICpjZGV2KQorY29uc3QgY2hhciAqY2Rldl9tb3VudF9kZWZh dWx0KHN0cnVjdCBjZGV2ICpjZGV2LCBjb25zdCBjaGFyICpmc29wdGlvbnMpCiB7CiAJY29uc3Qg Y2hhciAqcGF0aDsKIAljaGFyICpuZXdwYXRoLCAqZGV2cGF0aDsKQEAgLTE3MjAsNyArMTcyNyw3 IEBAIGNvbnN0IGNoYXIgKmNkZXZfbW91bnRfZGVmYXVsdChzdHJ1Y3QgY2RldiAqY2RldikKIAkv KgogCSAqIElmIHRoaXMgY2RldiBpcyBhbHJlYWR5IG1vdW50ZWQgc29tZXdoZXJlIHVzZSB0aGlz IHBhdGgKIAkgKiBpbnN0ZWFkIG9mIG1vdW50aW5nIGl0IGFnYWluIHRvIGF2b2lkIGNvcnJ1cHRp b24gb24gdGhlCi0JICogZmlsZXN5c3RlbS4KKwkgKiBmaWxlc3lzdGVtLiBOb3RlIHRoaXMgaWdu b3JlcyBldmVudHVhbCBmc29wdGlvbnMgdGhvdWdoLgogCSAqLwogCXBhdGggPSBjZGV2X2dldF9t b3VudF9wYXRoKGNkZXYpOwogCWlmIChwYXRoKQpAQCAtMTczMSw3ICsxNzM4LDcgQEAgY29uc3Qg Y2hhciAqY2Rldl9tb3VudF9kZWZhdWx0KHN0cnVjdCBjZGV2ICpjZGV2KQogCiAJZGV2cGF0aCA9 IGFzcHJpbnRmKCIvZGV2LyVzIiwgY2Rldi0+bmFtZSk7CiAKLQlyZXQgPSBtb3VudChkZXZwYXRo LCBOVUxMLCBuZXdwYXRoKTsKKwlyZXQgPSBtb3VudChkZXZwYXRoLCBOVUxMLCBuZXdwYXRoLCBm c29wdGlvbnMpOwogCiAJZnJlZShkZXZwYXRoKTsKIApAQCAtMTc2MSw2ICsxNzY4LDYgQEAgdm9p ZCBtb3VudF9hbGwodm9pZCkKIAkJc3RydWN0IGNkZXYgKmNkZXYgPSAmYmRldi0+Y2RldjsKIAog CQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNkZXYsICZiZGV2LT5kZXYtPmNkZXZzLCBkZXZpY2VzX2xp c3QpCi0JCQljZGV2X21vdW50X2RlZmF1bHQoY2Rldik7CisJCQljZGV2X21vdW50X2RlZmF1bHQo Y2RldiwgTlVMTCk7CiAJfQogfQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9mcy5oIGIvaW5jbHVkZS9m cy5oCmluZGV4IDg1NmUwMGFiYjA0My4uMDczNjQxYzc0NzQ2IDEwMDY0NAotLS0gYS9pbmNsdWRl L2ZzLmgKKysrIGIvaW5jbHVkZS9mcy5oCkBAIC05OSw2ICs5OSw3IEBAIHN0cnVjdCBmc19kZXZp Y2VfZCB7CiAJY2hhciAqcGF0aDsKIAlzdHJ1Y3QgZGV2aWNlX2QgKnBhcmVudF9kZXZpY2U7CiAJ c3RydWN0IGxpc3RfaGVhZCBsaXN0OworCWNoYXIgKm9wdGlvbnM7CiB9OwogCiAjZGVmaW5lIGRy dl90b19mc19kcml2ZXIoZCkgY29udGFpbmVyX29mKGQsIHN0cnVjdCBmc19kcml2ZXJfZCwgZHJ2 KQpAQCAtMTQwLDcgKzE0MSw4IEBAIGludCBjbG9zZWRpcihESVIgKmRpcik7CiBpbnQgc3ltbGlu ayhjb25zdCBjaGFyICpwYXRobmFtZSwgY29uc3QgY2hhciAqbmV3cGF0aCk7CiBpbnQgcmVhZGxp bmsoY29uc3QgY2hhciAqcGF0aCwgY2hhciAqYnVmLCBzaXplX3QgYnVmc2l6KTsKIAotaW50IG1v dW50IChjb25zdCBjaGFyICpkZXZpY2UsIGNvbnN0IGNoYXIgKmZzbmFtZSwgY29uc3QgY2hhciAq cGF0aCk7CitpbnQgbW91bnQgKGNvbnN0IGNoYXIgKmRldmljZSwgY29uc3QgY2hhciAqZnNuYW1l LCBjb25zdCBjaGFyICpwYXRoLAorCQljb25zdCBjaGFyICpmc29wdGlvbnMpOwogaW50IHVtb3Vu dChjb25zdCBjaGFyICpwYXRobmFtZSk7CiAKIC8qIG5vdC1zby1zdGFuZGFyZCBmdW5jdGlvbnMg Ki8KQEAgLTE5Nyw3ICsxOTksNyBAQCBpbnQgdW5saW5rX3JlY3Vyc2l2ZShjb25zdCBjaGFyICpw YXRoLCBjaGFyICoqZmFpbGVkcGF0aCk7CiAKIGludCBmc2Rldl9vcGVuX2NkZXYoc3RydWN0IGZz X2RldmljZV9kICpmc2Rldik7CiBjb25zdCBjaGFyICpjZGV2X2dldF9tb3VudF9wYXRoKHN0cnVj dCBjZGV2ICpjZGV2KTsKLWNvbnN0IGNoYXIgKmNkZXZfbW91bnRfZGVmYXVsdChzdHJ1Y3QgY2Rl diAqY2Rldik7Citjb25zdCBjaGFyICpjZGV2X21vdW50X2RlZmF1bHQoc3RydWN0IGNkZXYgKmNk ZXYsIGNvbnN0IGNoYXIgKmZzb3B0aW9ucyk7CiB2b2lkIG1vdW50X2FsbCh2b2lkKTsKIAogI2Vu ZGlmIC8qIF9fRlNfSCAqLwpkaWZmIC0tZ2l0IGEvbGliL2Jvb3RzdHJhcC9kaXNrLmMgYi9saWIv Ym9vdHN0cmFwL2Rpc2suYwppbmRleCA4NzlkMzMxNWU4ZTMuLjUyN2U0MzA4OTc5YyAxMDA2NDQK LS0tIGEvbGliL2Jvb3RzdHJhcC9kaXNrLmMKKysrIGIvbGliL2Jvb3RzdHJhcC9kaXNrLmMKQEAg LTIwLDcgKzIwLDcgQEAgdm9pZCogYm9vdHN0cmFwX3JlYWRfZGlzayhjaGFyICpkZXYsIGNoYXIg KmZzdHlwZSkKIAlpbnQgbGVuOwogCWNoYXIgKnBhdGggPSAiLyI7CiAKLQlyZXQgPSBtb3VudChk ZXYsIGZzdHlwZSwgcGF0aCk7CisJcmV0ID0gbW91bnQoZGV2LCBmc3R5cGUsIHBhdGgsIE5VTEwp OwogCWlmIChyZXQpIHsKIAkJYm9vdHN0cmFwX2VycigibW91bnRpbmcgJXMgZmFpbGVkIHdpdGgg JWRcbiIsIGRldiwgcmV0KTsKIAkJcmV0dXJuIE5VTEw7Ci0tIAoxLjguNS4yCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYmFyZWJveCBtYWlsaW5nIGxp c3QKYmFyZWJveEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vYmFyZWJveAo=