From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 4/7] tools/blktap2: fix possible '\0' truncation Date: Thu, 5 Apr 2018 03:50:52 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Wei Liu , Ian Jackson , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= List-Id: xen-devel@lists.xenproject.org Z2NjLTggY29tcGxhaW5zOgoKICAgIHRhcGRpc2stdmJkLmM6IEluIGZ1bmN0aW9uICd0YXBkaXNr X3ZiZF9yZXN1bWVfcmluZyc6CiAgICB0YXBkaXNrLXZiZC5jOjE2NzE6NTM6IGVycm9yOiAnc25w cmludGYnIG91dHB1dCBtYXkgYmUgdHJ1bmNhdGVkIGJlZm9yZSB0aGUgbGFzdCBmb3JtYXQgY2hh cmFjdGVyIFstV2Vycm9yPWZvcm1hdC10cnVuY2F0aW9uPV0KICAgICAgIHNucHJpbnRmKHBhcmFt cy5uYW1lLCBzaXplb2YocGFyYW1zLm5hbWUpIC0gMSwgIiVzIiwgbWVzc2FnZSk7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF4KICAgIHRh cGRpc2stdmJkLmM6MTY3MTozOiBub3RlOiAnc25wcmludGYnIG91dHB1dCBiZXR3ZWVuIDEgYW5k IDI1NiBieXRlcyBpbnRvIGEgZGVzdGluYXRpb24gb2Ygc2l6ZSAyNTUKICAgICAgIHNucHJpbnRm KHBhcmFtcy5uYW1lLCBzaXplb2YocGFyYW1zLm5hbWUpIC0gMSwgIiVzIiwgbWVzc2FnZSk7CiAg ICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+CgpUaGUgIi0gMSIgaW4gYnVmZmVyIHNpemUgc2hvdWxkIGJlIGFjdHVhbGx5IGFw cGxpZWQgdG8gbWVzc2FnZSwgdG8gbGVhdmUKcGxhY2UgZm9yIHRlcm1pbmF0aW5nICdcMCcsIG5v dCB0aGUgb3RoZXIgd2F5IGFyb3VuZCAodHJ1bmNhdGUgJ1wwJyBldmVuCmlmIGl0IHdvdWxkIGZp dCkuCgogICAgSW4gZnVuY3Rpb24gJ3RhcGRpc2tfY29udHJvbF9vcGVuX2ltYWdlJywKICAgICAg ICBpbmxpbmVkIGZyb20gJ3RhcGRpc2tfY29udHJvbF9oYW5kbGVfcmVxdWVzdCcgYXQgdGFwZGlz ay1jb250cm9sLmM6NjYwOjEwOgogICAgdGFwZGlzay1jb250cm9sLmM6NDY1OjI6IGVycm9yOiAn c3RybmNweScgc3BlY2lmaWVkIGJvdW5kIDI1NiBlcXVhbHMgZGVzdGluYXRpb24gc2l6ZSBbLVdl cnJvcj1zdHJpbmdvcC10cnVuY2F0aW9uXQogICAgICBzdHJuY3B5KHBhcmFtcy5uYW1lLCB2YmQt Pm5hbWUsIEJMS1RBUDJfTUFYX01FU1NBR0VfTEVOKTsKICAgICAgXn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KCiAgICBJbiBmdW5jdGlvbiAn dGFwZGlza19jb250cm9sX2NyZWF0ZV9zb2NrZXQnLAogICAgICAgIGlubGluZWQgZnJvbSAndGFw ZGlza19jb250cm9sX29wZW4nIGF0IHRhcGRpc2stY29udHJvbC5jOjgzNjo5OgogICAgdGFwZGlz ay1jb250cm9sLmM6NzkzOjI6IGVycm9yOiAnc3RybmNweScgc3BlY2lmaWVkIGJvdW5kIDEwOCBl cXVhbHMgZGVzdGluYXRpb24gc2l6ZSBbLVdlcnJvcj1zdHJpbmdvcC10cnVuY2F0aW9uXQogICAg ICBzdHJuY3B5KHNhZGRyLnN1bl9wYXRoLCB0ZF9jb250cm9sLnBhdGgsIHNpemVvZihzYWRkci5z dW5fcGF0aCkpOwogICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CgogICAgYmxvY2stcWNvdy5jOiBJbiBmdW5jdGlvbiAn cWNvd19jcmVhdGUnOgogICAgYmxvY2stcWNvdy5jOjEyMTY6NTogZXJyb3I6ICdzdHJuY3B5JyBz cGVjaWZpZWQgYm91bmQgNDA5NiBlcXVhbHMgZGVzdGluYXRpb24gc2l6ZSBbLVdlcnJvcj1zdHJp bmdvcC10cnVuY2F0aW9uXQogICAgICAgICBzdHJuY3B5KGJhY2tpbmdfZmlsZW5hbWUsIGJhY2tp bmdfZmlsZSwKICAgICAgICAgXn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ CiAgICAgICAgICBzaXplb2YoYmFja2luZ19maWxlbmFtZSkpOwogICAgICAgICAgfn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn5+fgoKSSB0aG9zZSBjYXNlcywgcmVkdWNlIHNpemUgb2YgY29waWVkIHN0 cmluZyBhbmQgbWFrZSBzdXJlIGZpbmFsICdcMCcgaXMKYWRkZWQuCgpTaWduZWQtb2ZmLWJ5OiBN YXJlayBNYXJjenlrb3dza2ktR8OzcmVja2kgPG1hcm1hcmVrQGludmlzaWJsZXRoaW5nc2xhYi5j b20+Ci0tLQogdG9vbHMvYmxrdGFwMi9kcml2ZXJzL2Jsb2NrLXFjb3cuYyAgICAgIHwgMyArKy0K IHRvb2xzL2Jsa3RhcDIvZHJpdmVycy90YXBkaXNrLWNvbnRyb2wuYyB8IDUgKysrLS0KIHRvb2xz L2Jsa3RhcDIvZHJpdmVycy90YXBkaXNrLXZiZC5jICAgICB8IDMgKystCiAzIGZpbGVzIGNoYW5n ZWQsIDcgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9i bGt0YXAyL2RyaXZlcnMvYmxvY2stcWNvdy5jIGIvdG9vbHMvYmxrdGFwMi9kcml2ZXJzL2Jsb2Nr LXFjb3cuYwppbmRleCBiNDViY2FhLi5hZTQzOTIyIDEwMDY0NAotLS0gYS90b29scy9ibGt0YXAy L2RyaXZlcnMvYmxvY2stcWNvdy5jCisrKyBiL3Rvb2xzL2Jsa3RhcDIvZHJpdmVycy9ibG9jay1x Y293LmMKQEAgLTEyMTQsNyArMTIxNCw4IEBAIGludCBxY293X2NyZWF0ZShjb25zdCBjaGFyICpm aWxlbmFtZSwgdWludDY0X3QgdG90YWxfc2l6ZSwKIAkJCWlmIChwICYmIChwIC0gYmFja2luZ19m aWxlKSA+PSAyKSB7CiAJCQkJLyogVVJMIGxpa2UgYnV0IGV4Y2x1ZGUgImM6IiBsaWtlIGZpbGVu YW1lcyAqLwogCQkJCXN0cm5jcHkoYmFja2luZ19maWxlbmFtZSwgYmFja2luZ19maWxlLAotCQkJ CQlzaXplb2YoYmFja2luZ19maWxlbmFtZSkpOworCQkJCQlzaXplb2YoYmFja2luZ19maWxlbmFt ZSkgLSAxKTsKKwkJCQliYWNraW5nX2ZpbGVuYW1lW3NpemVvZihiYWNraW5nX2ZpbGVuYW1lKSAt IDFdID0gJ1wwJzsKIAkJCX0gZWxzZSB7CiAJCQkJaWYgKHJlYWxwYXRoKGJhY2tpbmdfZmlsZSwg YmFja2luZ19maWxlbmFtZSkgPT0gTlVMTCB8fAogCQkJCSAgICBzdGF0KGJhY2tpbmdfZmlsZW5h bWUsICZzdCkgIT0gMCkgewpkaWZmIC0tZ2l0IGEvdG9vbHMvYmxrdGFwMi9kcml2ZXJzL3RhcGRp c2stY29udHJvbC5jIGIvdG9vbHMvYmxrdGFwMi9kcml2ZXJzL3RhcGRpc2stY29udHJvbC5jCmlu ZGV4IDBiNWNmM2MuLjNjYTU3MTMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Jsa3RhcDIvZHJpdmVycy90 YXBkaXNrLWNvbnRyb2wuYworKysgYi90b29scy9ibGt0YXAyL2RyaXZlcnMvdGFwZGlzay1jb250 cm9sLmMKQEAgLTQ2Miw3ICs0NjIsOCBAQCB0YXBkaXNrX2NvbnRyb2xfb3Blbl9pbWFnZShzdHJ1 Y3QgdGFwZGlza19jb250cm9sX2Nvbm5lY3Rpb24gKmNvbm5lY3Rpb24sCiAKIAlwYXJhbXMuY2Fw YWNpdHkgPSBpbWFnZS5zaXplOwogCXBhcmFtcy5zZWN0b3Jfc2l6ZSA9IGltYWdlLnNlY3NpemU7 Ci0Jc3RybmNweShwYXJhbXMubmFtZSwgdmJkLT5uYW1lLCBCTEtUQVAyX01BWF9NRVNTQUdFX0xF Tik7CisJc3RybmNweShwYXJhbXMubmFtZSwgdmJkLT5uYW1lLCBCTEtUQVAyX01BWF9NRVNTQUdF X0xFTiAtIDEpOworCXBhcmFtcy5uYW1lW0JMS1RBUDJfTUFYX01FU1NBR0VfTEVOIC0gMV0gPSAn XDAnOwogCiAJZXJyID0gaW9jdGwodmJkLT5yaW5nLmZkLCBCTEtUQVAyX0lPQ1RMX0NSRUFURV9E RVZJQ0UsICZwYXJhbXMpOwogCWlmIChlcnIgJiYgZXJybm8gIT0gRUVYSVNUKSB7CkBAIC03OTAs NyArNzkxLDcgQEAgdGFwZGlza19jb250cm9sX2NyZWF0ZV9zb2NrZXQoY2hhciAqKnNvY2tldF9w YXRoKQogCX0KIAogCW1lbXNldCgmc2FkZHIsIDAsIHNpemVvZihzYWRkcikpOwotCXN0cm5jcHko c2FkZHIuc3VuX3BhdGgsIHRkX2NvbnRyb2wucGF0aCwgc2l6ZW9mKHNhZGRyLnN1bl9wYXRoKSk7 CisJc3RybmNweShzYWRkci5zdW5fcGF0aCwgdGRfY29udHJvbC5wYXRoLCBzaXplb2Yoc2FkZHIu c3VuX3BhdGgpIC0gMSk7CiAJc2FkZHIuc3VuX2ZhbWlseSA9IEFGX1VOSVg7CiAKIAllcnIgPSBi aW5kKHRkX2NvbnRyb2wuc29ja2V0LApkaWZmIC0tZ2l0IGEvdG9vbHMvYmxrdGFwMi9kcml2ZXJz L3RhcGRpc2stdmJkLmMgYi90b29scy9ibGt0YXAyL2RyaXZlcnMvdGFwZGlzay12YmQuYwppbmRl eCBmZDQ5OTlhLi44NDJhNDI3IDEwMDY0NAotLS0gYS90b29scy9ibGt0YXAyL2RyaXZlcnMvdGFw ZGlzay12YmQuYworKysgYi90b29scy9ibGt0YXAyL2RyaXZlcnMvdGFwZGlzay12YmQuYwpAQCAt MTY2OCw3ICsxNjY4LDggQEAgb3V0OgogCiAJCXBhcmFtcy5zZWN0b3Jfc2l6ZSA9IGltYWdlLnNl Y3NpemU7CiAJCXBhcmFtcy5jYXBhY2l0eSAgICA9IGltYWdlLnNpemU7Ci0JCXNucHJpbnRmKHBh cmFtcy5uYW1lLCBzaXplb2YocGFyYW1zLm5hbWUpIC0gMSwgIiVzIiwgbWVzc2FnZSk7CisJCXNu cHJpbnRmKHBhcmFtcy5uYW1lLCBzaXplb2YocGFyYW1zLm5hbWUpLAorCQkJICIlLipzIiwgKGlu dClzaXplb2YocGFyYW1zLm5hbWUpIC0gMSwgbWVzc2FnZSk7CiAKIAkJaW9jdGwodmJkLT5yaW5n LmZkLCBCTEtUQVAyX0lPQ1RMX1NFVF9QQVJBTVMsICZwYXJhbXMpOwogCQl0ZF9mbGFnX2NsZWFy KHZiZC0+c3RhdGUsIFREX1ZCRF9QQVVTRUQpOwotLSAKZ2l0LXNlcmllcyAwLjkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5w cm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==