From: Stefan Hajnoczi Date: Wed, 22 Jul 2020 14:02:05 +0100 Message-Id: <20200722130206.224898-3-stefanha@redhat.com> In-Reply-To: <20200722130206.224898-1-stefanha@redhat.com> References: <20200722130206.224898-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [Virtio-fs] [PATCH for-5.1 2/3] virtiofsd: add container-friendly -o chroot sandboxing option List-Id: Development discussions about virtio-fs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: virtio-fs@redhat.com, rmohr@redhat.com, vromanso@redhat.com dmlydGlvZnNkIGNhbm5vdCBydW4gaW4gYW4gdW5wcml2aWxlZ2VkIGNvbnRhaW5lciBiZWNhdXNl IENBUF9TWVNfQURNSU4KaXMgcmVxdWlyZWQgdG8gY3JlYXRlIG5hbWVzcGFjZXMuCgpJbnRyb2R1 Y2UgYSB3ZWFrZXIgc2FuZGJveCB0aGF0IGlzIHN1ZmZpY2llbnQgaW4gY29udGFpbmVyIGVudmly b25tZW50cwpiZWNhdXNlIHRoZSBjb250YWluZXIgcnVudGltZSBhbHJlYWR5IHNldHMgdXAgbmFt ZXNwYWNlcy4gVXNlIGNocm9vdCB0bwpyZXN0cmljdCBwYXRoIHRyYXZlcnNhbCB0byB0aGUgc2hh cmVkIGRpcmVjdG9yeS4KCnZpcnRpb2ZzZCBsb3NlcyB0aGUgZm9sbG93aW5nOgoKMS4gTW91bnQg bmFtZXNwYWNlLiBUaGUgcHJvY2VzcyBjaHJvb3RzIHRvIHRoZSBzaGFyZWQgZGlyZWN0b3J5IGJ1 dAogICBsZWF2ZXMgdGhlIG1vdW50cyBpbiBwbGFjZS4gU2VjY29tcCByZWplY3RzIG1vdW50KDIp L3Vtb3VudCgyKQogICBzeXNjYWxscy4KCjIuIFBpZCBuYW1lc3BhY2UuIFRoaXMgc2hvdWxkIGJl IGZpbmUgYmVjYXVzZSB2aXJ0aW9mc2QgaXMgdGhlIG9ubHkKICAgcHJvY2VzcyBydW5uaW5nIGlu IHRoZSBjb250YWluZXIuCgozLiBOZXR3b3JrIG5hbWVzcGFjZS4gVGhpcyBzaG91bGQgYmUgZmlu ZSBiZWNhdXNlIHNlY2NvbXAgYWxyZWFkeQogICByZWplY3RzIHRoZSBjb25uZWN0KDIpIHN5c2Nh bGwsIGJ1dCBhbiBhZGRpdGlvbmFsIGxheWVyIG9mIHNlY3VyaXR5CiAgIGlzIGxvc3QuIENvbnRh aW5lciBydW50aW1lLXNwZWNpZmljIG5ldHdvcmsgc2VjdXJpdHkgcG9saWNpZXMgY2FuIGJlCiAg IHVzZWQgZHJvcCBuZXR3b3JrIHRyYWZmaWMgKGV4Y2VwdCBmb3IgdGhlIHZob3N0LXVzZXIgVU5J WCBkb21haW4KICAgc29ja2V0KS4KClNpZ25lZC1vZmYtYnk6IFN0ZWZhbiBIYWpub2N6aSA8c3Rl ZmFuaGFAcmVkaGF0LmNvbT4KLS0tCiB0b29scy92aXJ0aW9mc2QvaGVscGVyLmMgICAgICAgICB8 ICAzICsrKwogdG9vbHMvdmlydGlvZnNkL3Bhc3N0aHJvdWdoX2xsLmMgfCA0NCArKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLQogMiBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCsp LCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3ZpcnRpb2ZzZC9oZWxwZXIuYyBi L3Rvb2xzL3ZpcnRpb2ZzZC9oZWxwZXIuYwppbmRleCAzMTA1YjZjMjNhLi43NDIxYzljYTFhIDEw MDY0NAotLS0gYS90b29scy92aXJ0aW9mc2QvaGVscGVyLmMKKysrIGIvdG9vbHMvdmlydGlvZnNk L2hlbHBlci5jCkBAIC0xNTEsNiArMTUxLDkgQEAgdm9pZCBmdXNlX2NtZGxpbmVfaGVscCh2b2lk KQogICAgICAgICAgICAiICAgIC1vIGNhY2hlPTxtb2RlPiAgICAgICAgICAgIGNhY2hlIG1vZGUu IGNvdWxkIGJlIG9uZSBvZiBcImF1dG8sICIKICAgICAgICAgICAgImFsd2F5cywgbm9uZVwiXG4i CiAgICAgICAgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDogYXV0 b1xuIgorICAgICAgICAgICAiICAgIC1vIGNocm9vdHxub19jaHJvb3QgICAgICAgIHVzZSBjb250 YWluZXItZnJpZW5kbHkgY2hyb290IGluc3RlYWRcbiIKKyAgICAgICAgICAgIiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBvZiBzdHJvbmdlciBtb3VudCBuYW1lc3BhY2Ugc2FuZGJveFxu IgorICAgICAgICAgICAiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6IGZh bHNlXG4iCiAgICAgICAgICAgICIgICAgLW8gZmxvY2t8bm9fZmxvY2sgICAgICAgICAgZW5hYmxl L2Rpc2FibGUgZmxvY2tcbiIKICAgICAgICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBkZWZhdWx0OiBub19mbG9ja1xuIgogICAgICAgICAgICAiICAgIC1vIGxvZ19sZXZlbD08 bGV2ZWw+ICAgICAgIGxvZyBsZXZlbCwgZGVmYXVsdCB0byBcImluZm9cIlxuIgpkaWZmIC0tZ2l0 IGEvdG9vbHMvdmlydGlvZnNkL3Bhc3N0aHJvdWdoX2xsLmMgYi90b29scy92aXJ0aW9mc2QvcGFz c3Rocm91Z2hfbGwuYwppbmRleCA1MGExNjRhNTk5Li45OTBjMGE4YTcwIDEwMDY0NAotLS0gYS90 b29scy92aXJ0aW9mc2QvcGFzc3Rocm91Z2hfbGwuYworKysgYi90b29scy92aXJ0aW9mc2QvcGFz c3Rocm91Z2hfbGwuYwpAQCAtMTM5LDYgKzEzOSw3IEBAIGVudW0gewogCiBzdHJ1Y3QgbG9fZGF0 YSB7CiAgICAgcHRocmVhZF9tdXRleF90IG11dGV4OworICAgIGludCBjaHJvb3Q7IC8qIDEgLSB1 c2UgY2hyb290LCAwIC0gdXNlIG1vdW50IG5hbWVzcGFjZSAqLwogICAgIGludCBkZWJ1ZzsKICAg ICBpbnQgd3JpdGViYWNrOwogICAgIGludCBmbG9jazsKQEAgLTE2Miw2ICsxNjMsOCBAQCBzdHJ1 Y3QgbG9fZGF0YSB7CiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGZ1c2Vfb3B0IGxvX29wdHNb XSA9IHsKKyAgICB7ICJjaHJvb3QiLCBvZmZzZXRvZihzdHJ1Y3QgbG9fZGF0YSwgY2hyb290KSwg MSB9LAorICAgIHsgIm5vX2Nocm9vdCIsIG9mZnNldG9mKHN0cnVjdCBsb19kYXRhLCBjaHJvb3Qp LCAwIH0sCiAgICAgeyAid3JpdGViYWNrIiwgb2Zmc2V0b2Yoc3RydWN0IGxvX2RhdGEsIHdyaXRl YmFjayksIDEgfSwKICAgICB7ICJub193cml0ZWJhY2siLCBvZmZzZXRvZihzdHJ1Y3QgbG9fZGF0 YSwgd3JpdGViYWNrKSwgMCB9LAogICAgIHsgInNvdXJjZT0lcyIsIG9mZnNldG9mKHN0cnVjdCBs b19kYXRhLCBzb3VyY2UpLCAwIH0sCkBAIC0yNjY1LDYgKzI2NjgsMzcgQEAgc3RhdGljIHZvaWQg c2V0dXBfY2FwYWJpbGl0aWVzKGNoYXIgKm1vZGNhcHNfaW4pCiAgICAgcHRocmVhZF9tdXRleF91 bmxvY2soJmNhcC5tdXRleCk7CiB9CiAKKy8qCisgKiBVc2UgY2hyb290IGFzIGEgd2Vha2VyIHNh bmRib3ggZm9yIGVudmlyb25tZW50IHdoZXJlIHRoZSBwcm9jZXNzIGlzIGxhdW5jaGVkCisgKiB3 aXRob3V0IENBUF9TWVNfQURNSU4uCisgKi8KK3N0YXRpYyB2b2lkIHNldHVwX2Nocm9vdChzdHJ1 Y3QgbG9fZGF0YSAqbG8pCit7CisgICAgbG8tPnByb2Nfc2VsZl9mZCA9IG9wZW4oIi9wcm9jL3Nl bGYvZmQiLCBPX1BBVEgpOworICAgIGlmIChsby0+cHJvY19zZWxmX2ZkID09IC0xKSB7CisgICAg ICAgIGZ1c2VfbG9nKEZVU0VfTE9HX0VSUiwgIm9wZW4oXCIvcHJvYy9zZWxmL2ZkXCIsIE9fUEFU SCk6ICVtXG4iKTsKKyAgICAgICAgZXhpdCgxKTsKKyAgICB9CisKKyAgICAvKgorICAgICAqIE1h a2UgdGhlIHNoYXJlZCBkaXJlY3RvcnkgdGhlIGZpbGUgc3lzdGVtIHJvb3Qgc28gdGhhdCBGVVNF X09QRU4KKyAgICAgKiAobG9fb3BlbigpKSBjYW5ub3QgZXNjYXBlIHRoZSBzaGFyZWQgZGlyZWN0 b3J5IGJ5IG9wZW5pbmcgYSBzeW1saW5rLgorICAgICAqCisgICAgICogSXQncyBzdGlsbCBwb3Nz aWJsZSB0byBlc2NhcGUgdGhlIGNocm9vdCB2aWEgbG8tPnByb2Nfc2VsZl9mZCBidXQgdGhhdAor ICAgICAqIHJlcXVpcmVzIGdhaW5pbmcgY29udHJvbCBvZiB0aGUgcHJvY2VzcyBmaXJzdC4KKyAg ICAgKi8KKyAgICBpZiAoY2hyb290KGxvLT5zb3VyY2UpICE9IDApIHsKKyAgICAgICAgZnVzZV9s b2coRlVTRV9MT0dfRVJSLCAiY2hyb290KFwiJXNcIik6ICVtXG4iLCBsby0+c291cmNlKTsKKyAg ICAgICAgZXhpdCgxKTsKKyAgICB9CisKKyAgICAvKiBNb3ZlIGludG8gdGhlIGNocm9vdCAqLwor ICAgIGlmIChjaGRpcigiLyIpICE9IDApIHsKKyAgICAgICAgZnVzZV9sb2coRlVTRV9MT0dfRVJS LCAiY2hkaXIoXCIvXCIpOiAlbVxuIik7CisgICAgICAgIGV4aXQoMSk7CisgICAgfQorfQorCiAv KgogICogTG9jayBkb3duIHRoaXMgcHJvY2VzcyB0byBwcmV2ZW50IGFjY2VzcyB0byBvdGhlciBw cm9jZXNzZXMgb3IgZmlsZXMgb3V0c2lkZQogICogc291cmNlIGRpcmVjdG9yeS4gIFRoaXMgcmVk dWNlcyB0aGUgaW1wYWN0IG9mIGFyYml0cmFyeSBjb2RlIGV4ZWN1dGlvbiBidWdzLgpAQCAtMjY3 Miw4ICsyNzA2LDEzIEBAIHN0YXRpYyB2b2lkIHNldHVwX2NhcGFiaWxpdGllcyhjaGFyICptb2Rj YXBzX2luKQogc3RhdGljIHZvaWQgc2V0dXBfc2FuZGJveChzdHJ1Y3QgbG9fZGF0YSAqbG8sIHN0 cnVjdCBmdXNlX3Nlc3Npb24gKnNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIGVu YWJsZV9zeXNsb2cpCiB7Ci0gICAgc2V0dXBfbmFtZXNwYWNlcyhsbywgc2UpOwotICAgIHNldHVw X21vdW50cyhsby0+c291cmNlKTsKKyAgICBpZiAobG8tPmNocm9vdCkgeworICAgICAgICBzZXR1 cF9jaHJvb3QobG8pOworICAgIH0gZWxzZSB7CisgICAgICAgIHNldHVwX25hbWVzcGFjZXMobG8s IHNlKTsKKyAgICAgICAgc2V0dXBfbW91bnRzKGxvLT5zb3VyY2UpOworICAgIH0KKwogICAgIHNl dHVwX3NlY2NvbXAoZW5hYmxlX3N5c2xvZyk7CiAgICAgc2V0dXBfY2FwYWJpbGl0aWVzKGdfc3Ry ZHVwKGxvLT5tb2RjYXBzKSk7CiB9CkBAIC0yODIwLDYgKzI4NTksNyBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciAqYXJndltdKQogICAgIHN0cnVjdCBmdXNlX3Nlc3Npb24gKnNlOwogICAgIHN0 cnVjdCBmdXNlX2NtZGxpbmVfb3B0cyBvcHRzOwogICAgIHN0cnVjdCBsb19kYXRhIGxvID0gewor ICAgICAgICAuY2hyb290ID0gMCwKICAgICAgICAgLmRlYnVnID0gMCwKICAgICAgICAgLndyaXRl YmFjayA9IDAsCiAgICAgICAgIC5wb3NpeF9sb2NrID0gMSwKLS0gCjIuMjYuMgoK