From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423292AbXD3O0U (ORCPT ); Mon, 30 Apr 2007 10:26:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423296AbXD3O0U (ORCPT ); Mon, 30 Apr 2007 10:26:20 -0400 Received: from an-out-0708.google.com ([209.85.132.248]:35620 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423292AbXD3O0S (ORCPT ); Mon, 30 Apr 2007 10:26:18 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:mime-version:content-type; b=kitp8R5GJd+yN4bMbsOddW2K7A4FsafQhCwt/y7/QF4DIxkZsZfu92+vvlH538b9m9/Gluy060/tQJF8SRNK7HFWt6mYQprc1gIPeARA6p3HQzfkSNwvPOijtq6QpJtjyNfkN2fGnMm1yKXNuw75xRaypKI9Py0z1NvIrEquRwM= Message-ID: <524f69650704300726l38c855fds49b00b9bd98360ac@mail.gmail.com> Date: Mon, 30 Apr 2007 09:26:16 -0500 From: "Steve French" To: linux-kernel@vger.kernel.org Subject: UID/GID override on CIFS mounts to Samba and proposed new mount parameter to disable Unix Extensions on the client MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_278119_13799874.1177943176365" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org ------=_Part_278119_13799874.1177943176365 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline When CIFS Unix Extensions are negotiated we get the Unix uid and gid owners of the file from the server (on the Unix Query Path Info levels), but if the server's uids don't match the client uid's users were having to disable the Unix Extensions (which turned off features they still wanted). The attached patch allows users to override uid and/or gid for file/directory owner with a default uid and/or gid specified at mount (as is often done when mounting from Linux cifs client to Windows server). The attached patch also displays the uid and gid used by default in /proc/mounts (if applicable). I also would like suggestions on what we should call a proposed mount option (not coded yet) which would disable the CIFS Unix Extensions on a per-mount basis (or more likely actually would require it on the first mount to the server, subsequent mounts would probably inherit the capabilities). Current cifs code can disable mount options before a mount by specifying "echo 0 > /proc/fs/cifs/LinuxExtensionsEnabled") but it might be easier to specify it on mount (e.g. "nolinuxextensions" or "linuxextensions=no" ?). Slightly harder would be disabling Unix Extensions after the user has already mounted (with Unix Extensions) to the same server (perhaps to a different share). How important would it be to have two mounts to the same server one with unix extensions and one without? -- Thanks, Steve ------=_Part_278119_13799874.1177943176365 Content-Type: text/x-patch; name="allow-override-of-default-uid-on-unix-cifs-mounts.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="allow-override-of-default-uid-on-unix-cifs-mounts.patch" X-Attachment-Id: f_f151bwej ZGlmZiAtLWdpdCBhL2ZzL2NpZnMvQ0hBTkdFUyBiL2ZzL2NpZnMvQ0hBTkdFUwppbmRleCAzMDE2 MzFjLi42MmRjZjYzIDEwMDY0NAotLS0gYS9mcy9jaWZzL0NIQU5HRVMKKysrIGIvZnMvY2lmcy9D SEFOR0VTCkBAIC0yLDcgKzIsMTEgQEAgVmVyc2lvbiAxLjQ5CiAtLS0tLS0tLS0tLS0KIElQdjYg c3VwcG9ydC4gIEVuYWJsZSBpcHY2IGFkZHJlc3NlcyB0byBiZSBwYXNzZWQgb24gbW91bnQgKHB1 dCB0aGUgaXB2NgogYWRkcmVzcyBhZnRlciB0aGUgImlwPSIgbW91bnQgb3B0aW9uLCBhdCBsZWFz dCB1bnRpbCBtb3VudC5jaWZzIGlzIGZpeGVkIHRvCi1oYW5kbGUgRE5TIGhvc3QgdG8gaXB2NiBu YW1lIHRyYW5zbGF0aW9uKS4KK2hhbmRsZSBETlMgaG9zdCB0byBpcHY2IG5hbWUgdHJhbnNsYXRp b24pLiAgQWNjZXB0IG92ZXJyaWRlIG9mIHVpZCBvciBnaWQKK29uIG1vdW50IGV2ZW4gd2hlbiBV bml4IEV4dGVuc2lvbnMgYXJlIG5lZ290aWF0ZWQgKGl0IHVzZWQgdG8gYmUgaWdub3JlZAord2hl biBVbml4IEV4dGVuc2lvbnMgd2VyZSBpZ25vcmVkKS4gIFRoaXMgYWxsb3dzIHVzZXJzIHRvIG92 ZXJyaWRlIHRoZQorZGVmYXVsdCB1aWQgYW5kIGdpZCBmb3IgZmlsZXMgd2hlbiB0aGV5IGFyZSBj ZXJ0YWluIHRoYXQgdGhlIHVpZHMgb3IKK2dpZHMgb24gdGhlIHNlcnZlciBkbyBub3QgbWF0Y2gg dGhvc2Ugb2YgdGhlIGNsaWVudC4KIAogVmVyc2lvbiAxLjQ4CiAtLS0tLS0tLS0tLS0KZGlmZiAt LWdpdCBhL2ZzL2NpZnMvUkVBRE1FIGIvZnMvY2lmcy9SRUFETUUKaW5kZXggMDgwYzVlYi4uOTNm ZTM1OSAxMDA2NDQKLS0tIGEvZnMvY2lmcy9SRUFETUUKKysrIGIvZnMvY2lmcy9SRUFETUUKQEAg LTI1NywxMyArMjU3LDE5IEBAIEEgcGFydGlhbCBsaXN0IG9mIHRoZSBzdXBwb3J0ZWQgbW91bnQg b3AKIAkJbW91bnQuCQogICBkb21haW4JU2V0IHRoZSBTTUIvQ0lGUyB3b3JrZ3JvdXAgbmFtZSBw cmVwZW5kZWQgdG8gdGhlCiAJCXVzZXJuYW1lIGR1cmluZyBDSUZTIHNlc3Npb24gZXN0YWJsaXNo bWVudAotICB1aWQJCUlmIENJRlMgVW5peCBleHRlbnNpb25zIGFyZSBub3Qgc3VwcG9ydGVkIGJ5 IHRoZSBzZXJ2ZXIKLQkJdGhpcyBvdmVycmlkZXMgdGhlIGRlZmF1bHQgdWlkIGZvciBpbm9kZXMu IEZvciBtb3VudHMgdG8KLQkJc2VydmVycyB3aGljaCBkbyBzdXBwb3J0IHRoZSBDSUZTIFVuaXgg ZXh0ZW5zaW9ucywgc3VjaAotCQlhcyBhIHByb3Blcmx5IGNvbmZpZ3VyZWQgU2FtYmEgc2VydmVy LCB0aGUgc2VydmVyIHByb3ZpZGVzCi0JCXRoZSB1aWQsIGdpZCBhbmQgbW9kZS4gIEZvciBzZXJ2 ZXJzIHdoaWNoIGRvIG5vdCBzdXBwb3J0Ci0JCXRoZSBVbml4IGV4dGVuc2lvbnMsIHRoZSBkZWZh dWx0IHVpZCAoYW5kIGdpZCkgcmV0dXJuZWQgb24KLQkJbG9va3VwIG9mIGV4aXN0aW5nIGZpbGVz IGlzIHRoZSB1aWQgKGdpZCkgb2YgdGhlIHBlcnNvbgorICB1aWQJCVNldCB0aGUgZGVmYXVsdCB1 aWQgZm9yIGlub2Rlcy4gRm9yIG1vdW50cyB0byBzZXJ2ZXJzCisJCXdoaWNoIGRvIHN1cHBvcnQg dGhlIENJRlMgVW5peCBleHRlbnNpb25zLCBzdWNoIGFzIGEKKwkJcHJvcGVybHkgY29uZmlndXJl ZCBTYW1iYSBzZXJ2ZXIsIHRoZSBzZXJ2ZXIgcHJvdmlkZXMKKwkJdGhlIHVpZCwgZ2lkIGFuZCBt b2RlIHNvIHRoaXMgcGFyYW1ldGVyIHNob3VsZCAgbm90IGJlCisJCXNwZWNpZmllZCB1bmxlc3Mg dGhlIHNlcnZlciBhbmQgY2xpZW50cyB1aWQgYW5kIGdpZAorCQludW1iZXJpbmcgZGlmZmVyLiAg SWYgdGhlIHNlcnZlciBhbmQgY2xpZW50IGFyZSBpbiB0aGUKKwkJc2FtZSBkb21haW4gKGUuZy4g cnVubmluZyB3aW5iaW5kIG9yIG5zc19sZGFwKSBhbmQKKwkJdGhlIHNlcnZlciBzdXBwb3J0cyB0 aGUgVW5peCBFeHRlbnNpb25zIHRoZW4gdGhlIHVpZAorCQlhbmQgZ2lkIGNhbiBiZSByZXRyaWV2 ZWQgZnJvbSB0aGUgc2VydmVyIChhbmQgdWlkCisJCWFuZCBnaWQgd291bGQgbm90IGhhdmUgdG8g YmUgc3BlY2lmZWQgb24gdGhlIG1vdW50LiAKKwkJRm9yIHNlcnZlcnMgd2hpY2ggZG8gbm90IHN1 cHBvcnQgdGhlIENJRlMgVW5peAorCQlleHRlbnNpb25zLCB0aGUgZGVmYXVsdCB1aWQgKGFuZCBn aWQpIHJldHVybmVkIG9uIGxvb2t1cAorCQlvZiBleGlzdGluZyBmaWxlcyB3aWxsIGJlIHRoZSB1 aWQgKGdpZCkgb2YgdGhlIHBlcnNvbgogCQl3aG8gZXhlY3V0ZWQgdGhlIG1vdW50IChyb290LCBl eGNlcHQgd2hlbiBtb3VudC5jaWZzCiAJCWlzIGNvbmZpZ3VyZWQgc2V0dWlkIGZvciB1c2VyIG1v dW50cykgdW5sZXNzIHRoZSAidWlkPSIgCiAJCShnaWQpIG1vdW50IG9wdGlvbiBpcyBzcGVjaWZp ZWQuICBGb3IgdGhlIHVpZCAoZ2lkKSBvZiBuZXdseQpAQCAtMjgxLDggKzI4Nyw3IEBAIEEgcGFy dGlhbCBsaXN0IG9mIHRoZSBzdXBwb3J0ZWQgbW91bnQgb3AKIAkJdGhlIGNsaWVudC4gIE5vdGUg dGhhdCB0aGUgbW91bnQuY2lmcyBoZWxwZXIgbXVzdCBiZQogCQlhdCB2ZXJzaW9uIDEuMTAgb3Ig aGlnaGVyIHRvIHN1cHBvcnQgc3BlY2lmeWluZyB0aGUgdWlkCiAJCShvciBnaWQpIGluIG5vbi1u dW1iZXJpYyBmb3JtLgotICBnaWQJCUlmIENJRlMgVW5peCBleHRlbnNpb25zIGFyZSBub3Qgc3Vw cG9ydGVkIGJ5IHRoZSBzZXJ2ZXIKLQkJdGhpcyBvdmVycmlkZXMgdGhlIGRlZmF1bHQgZ2lkIGZv ciBpbm9kZXMuCisgIGdpZAkJU2V0IHRoZSBkZWZhdWx0IGdpZCBmb3IgaW5vZGVzIChzaW1pbGFy IHRvIGFib3ZlKS4KICAgZmlsZV9tb2RlICAgICBJZiBDSUZTIFVuaXggZXh0ZW5zaW9ucyBhcmUg bm90IHN1cHBvcnRlZCBieSB0aGUgc2VydmVyCiAJCXRoaXMgb3ZlcnJpZGVzIHRoZSBkZWZhdWx0 IG1vZGUgZm9yIGZpbGUgaW5vZGVzLgogICBkaXJfbW9kZSAgICAgIElmIENJRlMgVW5peCBleHRl bnNpb25zIGFyZSBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBzZXJ2ZXIgCmRpZmYgLS1naXQgYS9mcy9j aWZzL1RPRE8gYi9mcy9jaWZzL1RPRE8KaW5kZXggYjcwYTY5Yi4uNzhiNjIwZSAxMDA2NDQKLS0t IGEvZnMvY2lmcy9UT0RPCisrKyBiL2ZzL2NpZnMvVE9ETwpAQCAtODAsNyArODAsNyBAQCBuZWVk IHRvIGFkZCBhYmlsaXR5IHRvIHNldCB0aW1lIHRvIHNlcnZlCiAKIHUpIERPUyBhdHRycyAtIHJl dHVybmVkIGFzIHBzZXVkby14YXR0ciBpbiBTYW1iYSBmb3JtYXQgKGNoZWNrIFZGQVQgYW5kIE5U RlMgZm9yIHRoaXMgdG9vKQogCi12KSBtb3VudCBjaGVjayBmb3IgdW5tYXRjaGVkIHVpZHMgLSBh bmQgdWlkIG92ZXJyaWRlCit2KSBtb3VudCBjaGVjayBmb3IgdW5tYXRjaGVkIHVpZHMKIAogdykg QWRkIG1vdW50IG9wdGlvbiBmb3IgTGludXggZXh0ZW5zaW9uIGRpc2FibGUgcGVyIG1vdW50LCBh bmQgcGFydGlhbAogZGlzYWJsZSBwZXIgbW91bnQgKHVpZCBvZmYsIHN5bWxpbmsvZmlmby9ta25v ZCBvbiBidXQgd2hhdCBhYm91dCBwb3NpeCBhY2xzPykKZGlmZiAtLWdpdCBhL2ZzL2NpZnMvY2lm c19mc19zYi5oIGIvZnMvY2lmcy9jaWZzX2ZzX3NiLmgKaW5kZXggZmQxZTUyZS4uNGNjMjAxMiAx MDA2NDQKLS0tIGEvZnMvY2lmcy9jaWZzX2ZzX3NiLmgKKysrIGIvZnMvY2lmcy9jaWZzX2ZzX3Ni LmgKQEAgLTIyLDEyICsyMiwxNCBAQAogI2RlZmluZSBDSUZTX01PVU5UX1NFVF9VSUQgICAgICAy IC8qIHNldCBjdXJyZW50LT5ldWlkIGluIGNyZWF0ZSBldGMuICovCiAjZGVmaW5lIENJRlNfTU9V TlRfU0VSVkVSX0lOVU0gIDQgLyogaW5vZGUgbnVtYmVycyBmcm9tIHVuaXF1ZWlkIGZyb20gc2Vy dmVyICovCiAjZGVmaW5lIENJRlNfTU9VTlRfRElSRUNUX0lPICAgIDggLyogZG8gbm90IHdyaXRl IG5vciByZWFkIHRocm91Z2ggcGFnZSBjYWNoZSAqLwotI2RlZmluZSBDSUZTX01PVU5UX05PX1hB VFRSICAweDEwIC8qIGlmIHNldCAtIGRpc2FibGUgeGF0dHIgc3VwcG9ydCAqLwotI2RlZmluZSBD SUZTX01PVU5UX01BUF9TUEVDSUFMX0NIUiAweDIwIC8qIHJlbWFwIGlsbGVnYWwgY2hhcnMgaW4g ZmlsZW5hbWVzICovCi0jZGVmaW5lIENJRlNfTU9VTlRfUE9TSVhfUEFUSFMJMHg0MCAvKiBOZWdv dGlhdGUgcG9zaXggcGF0aG5hbWVzIGlmIHBvc3NpYmxlLiAqLwotI2RlZmluZSBDSUZTX01PVU5U X1VOWF9FTVVMCTB4ODAgLyogTmV0d29yayBjb21wYXQgd2l0aCBTRlVuaXggZW11bGF0aW9uICov Ci0jZGVmaW5lIENJRlNfTU9VTlRfTk9fQlJMCTB4MTAwIC8qIE5vIHNlbmRpbmcgYnl0ZSByYW5n ZSBsb2NrcyB0byBzcnYgKi8KLSNkZWZpbmUgQ0lGU19NT1VOVF9DSUZTX0FDTAkweDIwMCAvKiBz ZW5kIEFDTCByZXF1ZXN0cyB0byBub24tUE9TSVggc3J2ICovCisjZGVmaW5lIENJRlNfTU9VTlRf Tk9fWEFUVFIgICAgIDB4MTAgIC8qIGlmIHNldCAtIGRpc2FibGUgeGF0dHIgc3VwcG9ydCAgICAg ICAqLworI2RlZmluZSBDSUZTX01PVU5UX01BUF9TUEVDSUFMX0NIUiAweDIwIC8qIHJlbWFwIGls bGVnYWwgY2hhcnMgaW4gZmlsZW5hbWVzICAgKi8KKyNkZWZpbmUgQ0lGU19NT1VOVF9QT1NJWF9Q QVRIUyAgMHg0MCAgLyogTmVnb3RpYXRlIHBvc2l4IHBhdGhuYW1lcyBpZiBwb3NzaWJsZSovCisj ZGVmaW5lIENJRlNfTU9VTlRfVU5YX0VNVUwgICAgIDB4ODAgIC8qIE5ldHdvcmsgY29tcGF0IHdp dGggU0ZVbml4IGVtdWxhdGlvbiAqLworI2RlZmluZSBDSUZTX01PVU5UX05PX0JSTCAgICAgICAw eDEwMCAvKiBObyBzZW5kaW5nIGJ5dGUgcmFuZ2UgbG9ja3MgdG8gc3J2ICAgKi8KKyNkZWZpbmUg Q0lGU19NT1VOVF9DSUZTX0FDTCAgICAgMHgyMDAgLyogc2VuZCBBQ0wgcmVxdWVzdHMgdG8gbm9u LVBPU0lYIHNydiAgICovCisjZGVmaW5lIENJRlNfTU9VTlRfT1ZFUlJfVUlEICAgIDB4NDAwIC8q IG92ZXJyaWRlIHVpZCByZXR1cm5lZCBmcm9tIHNlcnZlciAgICAqLworI2RlZmluZSBDSUZTX01P VU5UX09WRVJSX0dJRCAgICAweDgwMCAvKiBvdmVycmlkZSBnaWQgcmV0dXJuZWQgZnJvbSBzZXJ2 ZXIgICAgKi8KIAogc3RydWN0IGNpZnNfc2JfaW5mbyB7CiAJc3RydWN0IGNpZnNUY29uSW5mbyAq dGNvbjsJLyogcHJpbWFyeSBtb3VudCAqLwpkaWZmIC0tZ2l0IGEvZnMvY2lmcy9jaWZzZnMuYyBi L2ZzL2NpZnMvY2lmc2ZzLmMKaW5kZXggZGQwM2U2OC4uMjRlYjBjNSAxMDA2NDQKLS0tIGEvZnMv Y2lmcy9jaWZzZnMuYworKysgYi9mcy9jaWZzL2NpZnNmcy5jCkBAIC0zMDYsNiArMzA2LDE0IEBA IGNpZnNfc2hvd19vcHRpb25zKHN0cnVjdCBzZXFfZmlsZSAqcywgc3QKIAkJCQkJICAgY2lmc19z Yi0+dGNvbi0+c2VzLT5kb21haW5OYW1lKTsKIAkJCX0KIAkJfQorCQlpZihjaWZzX3NiLT5tbnRf Y2lmc19mbGFncyAmIENJRlNfTU9VTlRfUE9TSVhfUEFUSFMpCisJCQlzZXFfcHJpbnRmKHMsICIs cG9zaXhwYXRocyIpOworCQlpZigoY2lmc19zYi0+bW50X2NpZnNfZmxhZ3MgJiBDSUZTX01PVU5U X09WRVJSX1VJRCkgfHwKKwkJICAgIShjaWZzX3NiLT50Y29uLT5zZXMtPmNhcGFiaWxpdGllcyAm IENBUF9VTklYKSkKKwkJCXNlcV9wcmludGYocywgIix1aWQ9JWQiLCBjaWZzX3NiLT5tbnRfdWlk KTsKKwkJaWYoKGNpZnNfc2ItPm1udF9jaWZzX2ZsYWdzICYgQ0lGU19NT1VOVF9PVkVSUl9HSUQp IHx8CisJCSAgICEoY2lmc19zYi0+dGNvbi0+c2VzLT5jYXBhYmlsaXRpZXMgJiBDQVBfVU5JWCkp CisJCQlzZXFfcHJpbnRmKHMsICIsZ2lkPSVkIiwgY2lmc19zYi0+bW50X2dpZCk7CiAJCXNlcV9w cmludGYocywgIixyc2l6ZT0lZCIsY2lmc19zYi0+cnNpemUpOwogCQlzZXFfcHJpbnRmKHMsICIs d3NpemU9JWQiLGNpZnNfc2ItPndzaXplKTsKIAl9CmRpZmYgLS1naXQgYS9mcy9jaWZzL2Nvbm5l Y3QuYyBiL2ZzL2NpZnMvY29ubmVjdC5jCmluZGV4IGMxYWYxNTkuLmE3YzZjMzUgMTAwNjQ0Ci0t LSBhL2ZzL2NpZnMvY29ubmVjdC5jCisrKyBiL2ZzL2NpZnMvY29ubmVjdC5jCkBAIC03NSw2ICs3 NSw4IEBAIHN0cnVjdCBzbWJfdm9sIHsKIAl1bnNpZ25lZCByZXRyeToxOwogCXVuc2lnbmVkIGlu dHI6MTsKIAl1bnNpZ25lZCBzZXR1aWRzOjE7CisJdW5zaWduZWQgb3ZlcnJpZGVfdWlkOjE7CisJ dW5zaWduZWQgb3ZlcnJpZGVfZ2lkOjE7CiAJdW5zaWduZWQgbm9wZXJtOjE7CiAJdW5zaWduZWQg bm9fcHN4X2FjbDoxOyAvKiBzZXQgaWYgcG9zaXggYWNsIHN1cHBvcnQgc2hvdWxkIGJlIGRpc2Fi bGVkICovCiAJdW5zaWduZWQgY2lmc19hY2w6MTsKQEAgLTEwNDIsMTEgKzEwNDQsMTMgQEAgY2lm c19wYXJzZV9tb3VudF9vcHRpb25zKGNoYXIgKm9wdGlvbnMsCiAJCQlpZiAodmFsdWUgJiYgKnZh bHVlKSB7CiAJCQkJdm9sLT5saW51eF91aWQgPQogCQkJCQlzaW1wbGVfc3RydG91bCh2YWx1ZSwg JnZhbHVlLCAwKTsKKwkJCQl2b2wtPm92ZXJyaWRlX3VpZCA9IDE7CiAJCQl9CiAJCX0gZWxzZSBp ZiAoc3RybmljbXAoZGF0YSwgImdpZCIsIDMpID09IDApIHsKIAkJCWlmICh2YWx1ZSAmJiAqdmFs dWUpIHsKIAkJCQl2b2wtPmxpbnV4X2dpZCA9CiAJCQkJCXNpbXBsZV9zdHJ0b3VsKHZhbHVlLCAm dmFsdWUsIDApOworCQkJCXZvbC0+b3ZlcnJpZGVfZ2lkID0gMTsKIAkJCX0KIAkJfSBlbHNlIGlm IChzdHJuaWNtcChkYXRhLCAiZmlsZV9tb2RlIiwgNCkgPT0gMCkgewogCQkJaWYgKHZhbHVlICYm ICp2YWx1ZSkgewpAQCAtMTk4OSw3ICsxOTkzLDEwIEBAIGNpZnNfbW91bnQoc3RydWN0IHN1cGVy X2Jsb2NrICpzYiwgc3RydWMKIAkJCWNpZnNfc2ItPm1udF9jaWZzX2ZsYWdzIHw9IENJRlNfTU9V TlRfTk9fQlJMOwogCQlpZih2b2x1bWVfaW5mby5jaWZzX2FjbCkKIAkJCWNpZnNfc2ItPm1udF9j aWZzX2ZsYWdzIHw9IENJRlNfTU9VTlRfQ0lGU19BQ0w7Ci0KKwkJaWYodm9sdW1lX2luZm8ub3Zl cnJpZGVfdWlkKQorCQkJY2lmc19zYi0+bW50X2NpZnNfZmxhZ3MgfD0gQ0lGU19NT1VOVF9PVkVS Ul9VSUQ7CisJCWlmKHZvbHVtZV9pbmZvLm92ZXJyaWRlX2dpZCkKKwkJCWNpZnNfc2ItPm1udF9j aWZzX2ZsYWdzIHw9IENJRlNfTU9VTlRfT1ZFUlJfR0lEOwogCQlpZih2b2x1bWVfaW5mby5kaXJl Y3RfaW8pIHsKIAkJCWNGWUkoMSwoIm1vdW50aW5nIHNoYXJlIHVzaW5nIGRpcmVjdCBpL28iKSk7 CiAJCQljaWZzX3NiLT5tbnRfY2lmc19mbGFncyB8PSBDSUZTX01PVU5UX0RJUkVDVF9JTzsKZGlm ZiAtLWdpdCBhL2ZzL2NpZnMvaW5vZGUuYyBiL2ZzL2NpZnMvaW5vZGUuYwppbmRleCBmNzRmMzdj Li5mZTVkMzI2IDEwMDY0NAotLS0gYS9mcy9jaWZzL2lub2RlLmMKKysrIGIvZnMvY2lmcy9pbm9k ZS5jCkBAIC0xMzksOCArMTM5LDE3IEBAIGludCBjaWZzX2dldF9pbm9kZV9pbmZvX3VuaXgoc3Ry dWN0IGlub2QKIAkJCWlub2RlLT5pX21vZGUgfD0gU19JRlJFRzsKIAkJCWNGWUkoMSwoInVua25v d24gdHlwZSAlZCIsdHlwZSkpOwogCQl9Ci0JCWlub2RlLT5pX3VpZCA9IGxlNjRfdG9fY3B1KGZp bmREYXRhLlVpZCk7Ci0JCWlub2RlLT5pX2dpZCA9IGxlNjRfdG9fY3B1KGZpbmREYXRhLkdpZCk7 CisJCQorCQlpZihjaWZzX3NiLT5tbnRfY2lmc19mbGFncyAmIENJRlNfTU9VTlRfT1ZFUlJfVUlE KQorCQkJaW5vZGUtPmlfdWlkID0gY2lmc19zYi0+bW50X3VpZDsKKwkJZWxzZQorCQkJaW5vZGUt PmlfdWlkID0gbGU2NF90b19jcHUoZmluZERhdGEuVWlkKTsKKworCQlpZihjaWZzX3NiLT5tbnRf Y2lmc19mbGFncyAmIENJRlNfTU9VTlRfT1ZFUlJfR0lEKQorCQkJaW5vZGUtPmlfZ2lkID0gY2lm c19zYi0+bW50X2dpZDsKKwkJZWxzZQorCQkJaW5vZGUtPmlfZ2lkID0gbGU2NF90b19jcHUoZmlu ZERhdGEuR2lkKTsKKwkJCQogCQlpbm9kZS0+aV9ubGluayA9IGxlNjRfdG9fY3B1KGZpbmREYXRh Lk5saW5rcyk7CiAKIAkJc3Bpbl9sb2NrKCZpbm9kZS0+aV9sb2NrKTsKQEAgLTUyMyw2ICs1MzIs OCBAQCBpbnQgY2lmc19nZXRfaW5vZGVfaW5mbyhzdHJ1Y3QgaW5vZGUgKipwCiAJCSAgIG9yIHJl dHJpZXZlIGZyb20gTlRGUyBzdHJlYW0gZXh0ZW5kZWQgYXR0cmlidXRlICovCiAJCWlmKGNpZnNf c2ItPm1udF9jaWZzX2ZsYWdzICYgQ0lGU19NT1VOVF9VTlhfRU1VTCkgewogCQkJLyogZmlsbCBp biB1aWQsIGdpZCwgbW9kZSBmcm9tIHNlcnZlciBBQ0wgKi8KKwkJCS8qIEJCIEZJWE1FIHRoaXMg c2hvdWxkIGFsc28gdGFrZSBpbnRvIGFjY291bnQgdGhlCisJCQkgKiBkZWZhdWx0IHVpZCBzcGVj aWZpZWQgb24gbW91bnQgaWYgcHJlc2VudCAqLwogCQkJZ2V0X3NmdV91aWRfbW9kZShpbm9kZSwg c2VhcmNoX3BhdGgsIGNpZnNfc2IsIHhpZCk7CiAJCX0gZWxzZSBpZiAoYXRvbWljX3JlYWQoJmNp ZnNJbmZvLT5pblVzZSkgPT0gMCkgewogCQkJaW5vZGUtPmlfdWlkID0gY2lmc19zYi0+bW50X3Vp ZDsKZGlmZiAtLWdpdCBhL2ZzL2NpZnMvcmVhZGRpci5jIGIvZnMvY2lmcy9yZWFkZGlyLmMKaW5k ZXggYjgwYjBmYy4uMjRkMzEzMyAxMDA2NDQKLS0tIGEvZnMvY2lmcy9yZWFkZGlyLmMKKysrIGIv ZnMvY2lmcy9yZWFkZGlyLmMKQEAgLTM1Nyw4ICszNTcsMTQgQEAgc3RhdGljIHZvaWQgdW5peF9m aWxsX2luX2lub2RlKHN0cnVjdCBpbgogCQljRllJKDEsKCJ1bmtub3duIGlub2RlIHR5cGUgJWQi LHR5cGUpKTsgCiAJfQogCi0JdG1wX2lub2RlLT5pX3VpZCA9IGxlNjRfdG9fY3B1KHBmaW5kRGF0 YS0+VWlkKTsKLQl0bXBfaW5vZGUtPmlfZ2lkID0gbGU2NF90b19jcHUocGZpbmREYXRhLT5HaWQp OworCWlmKGNpZnNfc2ItPm1udF9jaWZzX2ZsYWdzICYgQ0lGU19NT1VOVF9PVkVSUl9VSUQpCisJ CXRtcF9pbm9kZS0+aV91aWQgPSBjaWZzX3NiLT5tbnRfdWlkOworCWVsc2UKKwkJdG1wX2lub2Rl LT5pX3VpZCA9IGxlNjRfdG9fY3B1KHBmaW5kRGF0YS0+VWlkKTsKKwlpZihjaWZzX3NiLT5tbnRf Y2lmc19mbGFncyAmIENJRlNfTU9VTlRfT1ZFUlJfR0lEKQorCQl0bXBfaW5vZGUtPmlfZ2lkID0g Y2lmc19zYi0+bW50X2dpZDsKKwllbHNlCisJCXRtcF9pbm9kZS0+aV9naWQgPSBsZTY0X3RvX2Nw dShwZmluZERhdGEtPkdpZCk7CiAJdG1wX2lub2RlLT5pX25saW5rID0gbGU2NF90b19jcHUocGZp bmREYXRhLT5ObGlua3MpOwogCiAJc3Bpbl9sb2NrKCZ0bXBfaW5vZGUtPmlfbG9jayk7CkBAIC0z ODIsNyArMzg4LDYgQEAgc3RhdGljIHZvaWQgdW5peF9maWxsX2luX2lub2RlKHN0cnVjdCBpbgog CQkJCXRtcF9pbm9kZS0+aV9mb3AgPSAmY2lmc19maWxlX2RpcmVjdF9ub2JybF9vcHM7CiAJCQll bHNlCiAJCQkJdG1wX2lub2RlLT5pX2ZvcCA9ICZjaWZzX2ZpbGVfZGlyZWN0X29wczsKLQkJCiAJ CX0gZWxzZSBpZihjaWZzX3NiLT5tbnRfY2lmc19mbGFncyAmIENJRlNfTU9VTlRfTk9fQlJMKQog CQkJdG1wX2lub2RlLT5pX2ZvcCA9ICZjaWZzX2ZpbGVfbm9icmxfb3BzOwogCQllbHNlCg== ------=_Part_278119_13799874.1177943176365--