From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HqHnX-0006VY-4l for qemu-devel@nongnu.org; Mon, 21 May 2007 20:00:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HqHnU-0006Tu-MJ for qemu-devel@nongnu.org; Mon, 21 May 2007 20:00:18 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HqHnU-0006Tl-AQ for qemu-devel@nongnu.org; Mon, 21 May 2007 20:00:16 -0400 Received: from nz-out-0506.google.com ([64.233.162.227]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HqHnT-0000je-SE for qemu-devel@nongnu.org; Mon, 21 May 2007 20:00:16 -0400 Received: by nz-out-0506.google.com with SMTP id i11so740277nzi for ; Mon, 21 May 2007 17:00:15 -0700 (PDT) Message-ID: <53fbb7580705211700v43b9047aib5f65072a0815e98@mail.gmail.com> Date: Tue, 22 May 2007 03:00:14 +0300 From: "Lauri Leukkunen" Sender: lauri.leukkunen@gmail.com In-Reply-To: <53fbb7580705211634h3a7e9640q69a96fe704c26bcb@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_103465_14056684.1179792014979" References: <53fbb7580705211633v70c1e092m5f9a5f6167f3f7ca@mail.gmail.com> <53fbb7580705211634h3a7e9640q69a96fe704c26bcb@mail.gmail.com> Subject: [Qemu-devel] Re: [PATCH][UPDATED] Add support to linux-user for dropping LD_PRELOAD Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_103465_14056684.1179792014979 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline And while I'm at it here's the same with properly deallocated environ strings. On 5/22/07, Lauri Leukkunen wrote: > And here is the actual patch itself. > > On 5/22/07, Lauri Leukkunen wrote: > > This patch adds an option "-drop-ld-preload" which results in the > > target process not having LD_PRELOAD set in its environment. This is > > useful when running inside environments like scratchbox. > > > > This version of the patch doesn't unset("LD_PRELOAD") but modifies the > > envp argument to loader_exec() instead. > > > > /lauri > > > > ------=_Part_103465_14056684.1179792014979 Content-Type: text/x-diff; name=qemu-linux-user-drop-preload3.diff; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: base64 X-Attachment-Id: f_f1zliqkb Content-Disposition: attachment; filename="qemu-linux-user-drop-preload3.diff" SW5kZXg6IGxpbnV4LXVzZXIvbWFpbi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9zb3VyY2VzL3Fl bXUvcWVtdS9saW51eC11c2VyL21haW4uYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMDkKZGlm ZiAtdSAtcjEuMTA5IG1haW4uYwotLS0gbGludXgtdXNlci9tYWluLmMJMTMgTWF5IDIwMDcgMTM6 NTg6MDAgLTAwMDAJMS4xMDkKKysrIGxpbnV4LXVzZXIvbWFpbi5jCTIxIE1heSAyMDA3IDIzOjQ5 OjA1IC0wMDAwCkBAIC0xNjY2LDExICsxNjY2LDEyIEBACiAgICAgICAgICAgICJ1c2FnZTogcWVt dS0iIFRBUkdFVF9BUkNIICIgWy1oXSBbLWddIFstZCBvcHRzXSBbLUwgcGF0aF0gWy1zIHNpemVd IFstY3B1IG1vZGVsXSBwcm9ncmFtIFthcmd1bWVudHMuLi5dXG4iCiAgICAgICAgICAgICJMaW51 eCBDUFUgZW11bGF0b3IgKGNvbXBpbGVkIGZvciAlcyBlbXVsYXRpb24pXG4iCiAgICAgICAgICAg ICJcbiIKLSAgICAgICAgICAgIi1oICAgICAgICAgICBwcmludCB0aGlzIGhlbHBcbiIKLSAgICAg ICAgICAgIi1nIHBvcnQgICAgICB3YWl0IGdkYiBjb25uZWN0aW9uIHRvIHBvcnRcbiIKLSAgICAg ICAgICAgIi1MIHBhdGggICAgICBzZXQgdGhlIGVsZiBpbnRlcnByZXRlciBwcmVmaXggKGRlZmF1 bHQ9JXMpXG4iCi0gICAgICAgICAgICItcyBzaXplICAgICAgc2V0IHRoZSBzdGFjayBzaXplIGlu IGJ5dGVzIChkZWZhdWx0PSVsZClcbiIKLSAgICAgICAgICAgIi1jcHUgbW9kZWwgICBzZWxlY3Qg Q1BVICgtY3B1ID8gZm9yIGxpc3QpXG4iCisgICAgICAgICAgICItaCAgICAgICAgICAgICAgICBw cmludCB0aGlzIGhlbHBcbiIKKyAgICAgICAgICAgIi1nIHBvcnQgICAgICAgICAgIHdhaXQgZ2Ri IGNvbm5lY3Rpb24gdG8gcG9ydFxuIgorICAgICAgICAgICAiLUwgcGF0aCAgICAgICAgICAgc2V0 IHRoZSBlbGYgaW50ZXJwcmV0ZXIgcHJlZml4IChkZWZhdWx0PSVzKVxuIgorICAgICAgICAgICAi LXMgc2l6ZSAgICAgICAgICAgc2V0IHRoZSBzdGFjayBzaXplIGluIGJ5dGVzIChkZWZhdWx0PSVs ZClcbiIKKyAgICAgICAgICAgIi1jcHUgbW9kZWwgICAgICAgIHNlbGVjdCBDUFUgKC1jcHUgPyBm b3IgbGlzdClcbiIKKyAgICAgICAgICAgIi1kcm9wLWxkLXByZWxvYWQgIGRyb3AgTERfUFJFTE9B RCBmb3IgdGFyZ2V0IHByb2Nlc3NcbiIKICAgICAgICAgICAgIlxuIgogICAgICAgICAgICAiZGVi dWcgb3B0aW9uczpcbiIKICNpZmRlZiBVU0VfQ09ERV9DT1BZCkBAIC0xNzAyLDcgKzE3MDMsOSBA QAogICAgIGludCBvcHRpbmQ7CiAgICAgY29uc3QgY2hhciAqcjsKICAgICBpbnQgZ2Ric3R1Yl9w b3J0ID0gMDsKLSAgICAKKyAgICBpbnQgZHJvcF9sZF9wcmVsb2FkID0gMCwgZW52aXJvbl9jb3Vu dCA9IDA7CisgICAgY2hhciAqKnRhcmdldF9lbnZpcm9uLCAqKndyaywgKipkc3Q7CisKICAgICBp ZiAoYXJnYyA8PSAxKQogICAgICAgICB1c2FnZSgpOwogCkBAIC0xNzc0LDYgKzE3NzcsOCBAQAog I2VuZGlmCiAgICAgICAgICAgICAgICAgX2V4aXQoMSk7CiAgICAgICAgICAgICB9CisgICAgICAg IH0gZWxzZSBpZiAoIXN0cmNtcChyLCAiZHJvcC1sZC1wcmVsb2FkIikpIHsKKyAgICAgICAgICAg IGRyb3BfbGRfcHJlbG9hZCA9IDE7CiAgICAgICAgIH0gZWxzZSAKICNpZmRlZiBVU0VfQ09ERV9D T1BZCiAgICAgICAgIGlmICghc3RyY21wKHIsICJuby1jb2RlLWNvcHkiKSkgewpAQCAtMTgwMiwx MSArMTgwNywyOSBAQAogICAgIGVudiA9IGNwdV9pbml0KCk7CiAgICAgZ2xvYmFsX2VudiA9IGVu djsKICAgICAKLSAgICBpZiAobG9hZGVyX2V4ZWMoZmlsZW5hbWUsIGFyZ3Yrb3B0aW5kLCBlbnZp cm9uLCByZWdzLCBpbmZvKSAhPSAwKSB7Ci0JcHJpbnRmKCJFcnJvciBsb2FkaW5nICVzXG4iLCBm aWxlbmFtZSk7Ci0JX2V4aXQoMSk7CisgICAgd3JrID0gZW52aXJvbjsKKyAgICB3aGlsZSAoKih3 cmsrKykpCisgICAgICAgIGVudmlyb25fY291bnQrKzsKKworICAgIHRhcmdldF9lbnZpcm9uID0g bWFsbG9jKChlbnZpcm9uX2NvdW50ICsgMSkgKiBzaXplb2YoY2hhciAqKSk7CisgICAgZm9yICh3 cmsgPSBlbnZpcm9uLCBkc3QgPSB0YXJnZXRfZW52aXJvbjsgKndyazsgd3JrKyspIHsKKyAgICAg ICAgaWYgKGRyb3BfbGRfcHJlbG9hZCAmJiAhc3RybmNtcCgqd3JrLCAiTERfUFJFTE9BRD0iLCAx MSkpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgKihkc3QrKykgPSBzdHJkdXAoKndy ayk7CisgICAgfQorICAgIGRzdCA9IE5VTEw7IC8qIE5VTEwgdGVybWluYXRlIHRhcmdldF9lbnZp cm9uICovCisKKyAgICBpZiAobG9hZGVyX2V4ZWMoZmlsZW5hbWUsIGFyZ3Yrb3B0aW5kLCB0YXJn ZXRfZW52aXJvbiwgcmVncywgaW5mbykgIT0gMCkgeworICAgICAgICBwcmludGYoIkVycm9yIGxv YWRpbmcgJXNcbiIsIGZpbGVuYW1lKTsKKyAgICAgICAgX2V4aXQoMSk7CisgICAgfQorCisgICAg Zm9yICh3cmsgPSB0YXJnZXRfZW52aXJvbjsgKndyazsgd3JrKyspIHsKKyAgICAgICAgZnJlZSgq d3JrKTsKICAgICB9CiAgICAgCisgICAgZnJlZSh0YXJnZXRfZW52aXJvbik7CisKICAgICBpZiAo bG9nbGV2ZWwpIHsKICAgICAgICAgcGFnZV9kdW1wKGxvZ2ZpbGUpOwogICAgIAo= ------=_Part_103465_14056684.1179792014979--