From owner-freebsd-stable@FreeBSD.ORG Wed Jan 30 06:21:13 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2A634229; Wed, 30 Jan 2013 06:21:13 +0000 (UTC) (envelope-from kpaasial@gmail.com) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by mx1.freebsd.org (Postfix) with ESMTP id 55DE7F98; Wed, 30 Jan 2013 06:21:11 +0000 (UTC) Received: by mail-wi0-f179.google.com with SMTP id o1so1197612wic.6 for ; Tue, 29 Jan 2013 22:21:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=7MF2VXuY0CDNZLrMYfocq9yQLF6SOlvQ1c2L4n52i/w=; b=vs55IfzJuDQMko3id+GasgzLoZiY/n4+BJw3cCFwmuzRAF6qxGhgXEzKY5c4az3FTQ LGefAk3dN3rhDTi/3miVUC//lx6IE5K9C283sWM/Sde8p8H4YR9L9aTpJZ7+hSX64srk +4QVsRbceNGbecDL1ZHw8opXlXJUbVOjqMaeHu9S/7xneuP9bTMc1Vka8qQR5dfC6Dwe d4W1yPwmylgInsiP2Ckft0TbA2OHIxCjnDQtTf9+V+JrXEO3iSuco7rp6/FXkSfF6Zp4 K+RPVX0jOLQNKP0s6e39W7AVEe+hkQFtofGXP1uJttpCxexUbbLHpkAlq7y7eodv+oSP kobA== MIME-Version: 1.0 X-Received: by 10.194.21.70 with SMTP id t6mr6491540wje.42.1359526871051; Tue, 29 Jan 2013 22:21:11 -0800 (PST) Received: by 10.216.172.197 with HTTP; Tue, 29 Jan 2013 22:21:10 -0800 (PST) In-Reply-To: References: <50F6D20A.6070306@FreeBSD.org> <20130117001116.GD29437@lor.one-eyed-alien.net> <50F81588.5020106@FreeBSD.org> <51081E18.60303@sentex.net> Date: Wed, 30 Jan 2013 08:21:10 +0200 Message-ID: Subject: Re: CLANG 3.2 breaks security/pam_ssh_agent_auth on stable/9 From: Kimmo Paasiala To: James Content-Type: multipart/mixed; boundary=047d7b5d3ef6362eec04d47b843e Cc: Dimitry Andric , Brooks Davis , FreeBSD Stable Mailing List X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 06:21:13 -0000 --047d7b5d3ef6362eec04d47b843e Content-Type: text/plain; charset=UTF-8 On Wed, Jan 30, 2013 at 7:27 AM, James wrote: > I was able to correct the problem as well by prefixing strnvis, avoiding the > symbol collision. I also found PR: ports/172941 which also has a fix. > > Using my patch or the patch in ports/172941 fixes the segfault for me in > stable/9. However, I quickly ran into another problem. I can't remember the > error message exactly, it was something like "Unable to initialize PAM: > Unknown file descriptor". A ktrace didn't reveal anything obvious. I'll try > to test it out tomorrow. > > -- > James. Try the attached patch. Just drop it into /usr/ports/security/pam_ssh_agent_auth/files directory and recompile. This will make the port use the system strnvis() with correctly ordered arguments if one is available (HAVE_STRNVIS defined) and an _openbsd suffixed version if not. -Kimmo --047d7b5d3ef6362eec04d47b843e Content-Type: text/plain; charset=US-ASCII; name="patch-strnvis.txt" Content-Disposition: attachment; filename="patch-strnvis.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hck31gu80 LS0tIC4uLy4uLy4uL3BhbV9zc2hfYWdlbnRfYXV0aC93b3JrL3BhbV9zc2hfYWdlbnRfYXV0aC0w LjkuMy9vcGVuYnNkLWNvbXBhdC92aXMuaAkyMDA5LTAxLTA1IDA5OjMxOjA3LjAwMDAwMDAwMCAr MDIwMAorKysgb3BlbmJzZC1jb21wYXQvdmlzLmgJMjAxMy0wMS0zMCAwNzoxMzoxOS43ODI0MzEy NTcgKzAyMDAKQEAgLTc5LDE1ICs3OSwxNiBAQAogICovCiAjZGVmaW5lCVVOVklTX0VORAkxCS8q IG5vIG1vcmUgY2hhcmFjdGVycyAqLwogCi1jaGFyCSp2aXMoY2hhciAqLCBpbnQsIGludCwgaW50 KTsKLWludAlzdHJ2aXMoY2hhciAqLCBjb25zdCBjaGFyICosIGludCk7Ci1pbnQJc3RybnZpcyhj aGFyICosIGNvbnN0IGNoYXIgKiwgc2l6ZV90LCBpbnQpCisKK2NoYXIJKnZpc19vcGVuYnNkKGNo YXIgKiwgaW50LCBpbnQsIGludCk7CitpbnQJc3RydmlzX29wZW5ic2QoY2hhciAqLCBjb25zdCBj aGFyICosIGludCk7CitpbnQJc3RybnZpc19vcGVuYnNkKGNoYXIgKiwgY29uc3QgY2hhciAqLCBz aXplX3QsIGludCkKIAkJX19hdHRyaWJ1dGVfXyAoKF9fYm91bmRlZF9fKF9fc3RyaW5nX18sMSwz KSkpOwotaW50CXN0cnZpc3goY2hhciAqLCBjb25zdCBjaGFyICosIHNpemVfdCwgaW50KQoraW50 CXN0cnZpc3hfb3BlbmJzZChjaGFyICosIGNvbnN0IGNoYXIgKiwgc2l6ZV90LCBpbnQpCiAJCV9f YXR0cmlidXRlX18gKChfX2JvdW5kZWRfXyhfX3N0cmluZ19fLDEsMykpKTsKLWludAlzdHJ1bnZp cyhjaGFyICosIGNvbnN0IGNoYXIgKik7Ci1pbnQJdW52aXMoY2hhciAqLCBjaGFyLCBpbnQgKiwg aW50KTsKLXNzaXplX3Qgc3RybnVudmlzKGNoYXIgKiwgY29uc3QgY2hhciAqLCBzaXplX3QpCitp bnQJc3RydW52aXNfb3BlbmJzZChjaGFyICosIGNvbnN0IGNoYXIgKik7CitpbnQJdW52aXNfb3Bl bmJzZChjaGFyICosIGNoYXIsIGludCAqLCBpbnQpOworc3NpemVfdCBzdHJudW52aXNfb3BlbmJz ZChjaGFyICosIGNvbnN0IGNoYXIgKiwgc2l6ZV90KQogCQlfX2F0dHJpYnV0ZV9fICgoX19ib3Vu ZGVkX18oX19zdHJpbmdfXywxLDMpKSk7CiAKICNlbmRpZiAvKiAhX1ZJU19IXyAqLwotLS0gLi4v Li4vLi4vcGFtX3NzaF9hZ2VudF9hdXRoL3dvcmsvcGFtX3NzaF9hZ2VudF9hdXRoLTAuOS4zL2xv Zy5jCTIwMTMtMDEtMzAgMDc6MDk6MjQuMzI1NDA1ODc5ICswMjAwCisrKyBsb2cuYwkyMDEzLTAx LTMwIDA3OjE0OjEzLjcwODQyMjUxMSArMDIwMApAQCAtMzYwLDkgKzM2MCwxMyBAQAogCQlzbnBy aW50ZihmbXRidWYsIHNpemVvZihmbXRidWYpLCAiJXM6ICVzIiwgcHJlZmFjZSwgZm10KTsKIAkJ dnNucHJpbnRmKG1zZ2J1Ziwgc2l6ZW9mKG1zZ2J1ZiksIGZtdGJ1ZiwgYXJncyk7CiAJfQotCi0J c3RybnZpcyhmbXRidWYsIG1zZ2J1Ziwgc2l6ZW9mKGZtdGJ1ZiksCisjaWYgZGVmaW5lZCAoSEFW RV9TVFJOVklTKQorCXN0cm52aXMoZm10YnVmLCBzaXplb2YoZm10YnVmKSwgbXNnYnVmLAorCSAg ICBsb2dfb25fc3RkZXJyID8gTE9HX1NUREVSUl9WSVMgOiBMT0dfU1lTTE9HX1ZJUyk7CisjZWxz ZQorCXN0cm52aXNfb3BlbmJzZChmbXRidWYsIG1zZ2J1Ziwgc2l6ZW9mKGZtdGJ1ZiksCiAJICAg IGxvZ19vbl9zdGRlcnIgPyBMT0dfU1RERVJSX1ZJUyA6IExPR19TWVNMT0dfVklTKTsKKyNlbmRp ZgogCiAgICAgaWYobGV2ZWwgPT0gU1lTTE9HX0xFVkVMX0ZBVEFMKSB7CiAJCXNucHJpbnRmKG1z Z2J1Ziwgc2l6ZW9mIG1zZ2J1ZiwgIiVzXHJcblRoaXMgaW5jaWRlbnQgaGFzIGJlZW4gcmVwb3J0 ZWQgdG8gdGhlIGF1dGhvcml0aWVzXHJcbiIsIGZtdGJ1Zik7Ci0tLSAuLi8uLi8uLi9wYW1fc3No X2FnZW50X2F1dGgvd29yay9wYW1fc3NoX2FnZW50X2F1dGgtMC45LjMvb3BlbmJzZC1jb21wYXQv dmlzLmMJMjAwOS0wMS0wNSAwOTozMTowNy4wMDAwMDAwMDAgKzAyMDAKKysrIG9wZW5ic2QtY29t cGF0L3Zpcy5jCTIwMTMtMDEtMzAgMDc6MzE6NTAuNTE2NDQxNTcxICswMjAwCkBAIC01NCw3ICs1 NCw3IEBACiAgKiB2aXMgLSB2aXN1YWxseSBlbmNvZGUgY2hhcmFjdGVycwogICovCiBjaGFyICoK LXZpcyhjaGFyICpkc3QsIGludCBjLCBpbnQgZmxhZywgaW50IG5leHRjKQordmlzX29wZW5ic2Qo Y2hhciAqZHN0LCBpbnQgYywgaW50IGZsYWcsIGludCBuZXh0YykKIHsKIAlpZiAoaXN2aXNpYmxl KGMpKSB7CiAJCSpkc3QrKyA9IGM7CkBAIC0xNTEsMTkgKzE1MSwxOSBAQAogICoJVGhpcyBpcyB1 c2VmdWwgZm9yIGVuY29kaW5nIGEgYmxvY2sgb2YgZGF0YS4KICAqLwogaW50Ci1zdHJ2aXMoY2hh ciAqZHN0LCBjb25zdCBjaGFyICpzcmMsIGludCBmbGFnKQorc3RydmlzX29wZW5ic2QoY2hhciAq ZHN0LCBjb25zdCBjaGFyICpzcmMsIGludCBmbGFnKQogewogCWNoYXIgYzsKIAljaGFyICpzdGFy dDsKIAogCWZvciAoc3RhcnQgPSBkc3Q7IChjID0gKnNyYyk7KQotCQlkc3QgPSB2aXMoZHN0LCBj LCBmbGFnLCAqKytzcmMpOworCQlkc3QgPSB2aXNfb3BlbmJzZChkc3QsIGMsIGZsYWcsICorK3Ny Yyk7CiAJKmRzdCA9ICdcMCc7CiAJcmV0dXJuIChkc3QgLSBzdGFydCk7CiB9CiAKIGludAotc3Ry bnZpcyhjaGFyICpkc3QsIGNvbnN0IGNoYXIgKnNyYywgc2l6ZV90IHNpeiwgaW50IGZsYWcpCitz dHJudmlzX29wZW5ic2QoY2hhciAqZHN0LCBjb25zdCBjaGFyICpzcmMsIHNpemVfdCBzaXosIGlu dCBmbGFnKQogewogCWNoYXIgKnN0YXJ0LCAqZW5kOwogCWNoYXIgdGJ1Zls1XTsKQEAgLTE4Niw3 ICsxODYsNyBAQAogCQkJfQogCQkJc3JjKys7CiAJCX0gZWxzZSB7Ci0JCQlpID0gdmlzKHRidWYs IGMsIGZsYWcsICorK3NyYykgLSB0YnVmOworCQkJaSA9IHZpc19vcGVuYnNkKHRidWYsIGMsIGZs YWcsICorK3NyYykgLSB0YnVmOwogCQkJaWYgKGRzdCArIGkgPD0gZW5kKSB7CiAJCQkJbWVtY3B5 KGRzdCwgdGJ1ZiwgaSk7CiAJCQkJZHN0ICs9IGk7CkBAIC0yMDEsMjMgKzIwMSwyMyBAQAogCWlm IChkc3QgKyBpID4gZW5kKSB7CiAJCS8qIGFkanVzdCByZXR1cm4gdmFsdWUgZm9yIHRydW5jYXRp b24gKi8KIAkJd2hpbGUgKChjID0gKnNyYykpCi0JCQlkc3QgKz0gdmlzKHRidWYsIGMsIGZsYWcs ICorK3NyYykgLSB0YnVmOworCQkJZHN0ICs9IHZpc19vcGVuYnNkKHRidWYsIGMsIGZsYWcsICor K3NyYykgLSB0YnVmOwogCX0KIAlyZXR1cm4gKGRzdCAtIHN0YXJ0KTsKIH0KIAogaW50Ci1zdHJ2 aXN4KGNoYXIgKmRzdCwgY29uc3QgY2hhciAqc3JjLCBzaXplX3QgbGVuLCBpbnQgZmxhZykKK3N0 cnZpc3hfb3BlbmJzZChjaGFyICpkc3QsIGNvbnN0IGNoYXIgKnNyYywgc2l6ZV90IGxlbiwgaW50 IGZsYWcpCiB7CiAJY2hhciBjOwogCWNoYXIgKnN0YXJ0OwogCiAJZm9yIChzdGFydCA9IGRzdDsg bGVuID4gMTsgbGVuLS0pIHsKIAkJYyA9ICpzcmM7Ci0JCWRzdCA9IHZpcyhkc3QsIGMsIGZsYWcs ICorK3NyYyk7CisJCWRzdCA9IHZpc19vcGVuYnNkKGRzdCwgYywgZmxhZywgKisrc3JjKTsKIAl9 CiAJaWYgKGxlbikKLQkJZHN0ID0gdmlzKGRzdCwgKnNyYywgZmxhZywgJ1wwJyk7CisJCWRzdCA9 IHZpc19vcGVuYnNkKGRzdCwgKnNyYywgZmxhZywgJ1wwJyk7CiAJKmRzdCA9ICdcMCc7CiAJcmV0 dXJuIChkc3QgLSBzdGFydCk7CiB9Cg== --047d7b5d3ef6362eec04d47b843e--