From owner-freebsd-net@freebsd.org Wed Apr 20 23:56:45 2016 Return-Path: Delivered-To: freebsd-net@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F8D1B16DEB for ; Wed, 20 Apr 2016 23:56:45 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: from reviews.nyi.freebsd.org (reviews.nyi.freebsd.org [IPv6:2610:1c1:1:607c::16:b]) by mx1.freebsd.org (Postfix) with ESMTP id 2DB1A1A64 for ; Wed, 20 Apr 2016 23:56:45 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: by reviews.nyi.freebsd.org (Postfix, from userid 1346) id A57C5C43B; Wed, 20 Apr 2016 23:56:44 +0000 (UTC) Date: Wed, 20 Apr 2016 23:56:44 +0000 To: freebsd-net@freebsd.org From: Phabricator Reply-to: D5853+325+47f73f6fef2a530d@reviews.freebsd.org Subject: [Differential] D5853: dhclient: Log a warning instead of bailing upon "illegal" options Message-ID: X-Priority: 3 X-Phabricator-Sent-This-Message: Yes X-Mail-Transport-Agent: MetaMTA X-Auto-Response-Suppress: All X-Phabricator-Mail-Tags: , Thread-Topic: D5853: dhclient: Log a warning instead of bailing upon "illegal" options X-Herald-Rules: none X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-Cc: Precedence: bulk In-Reply-To: References: Thread-Index: NzcwN2IzZDEwOWQ3OGQ5NTIxYzJjMDI3ZmM0IFcYFzw= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_f8e61a04e9e2478512267ca6bdd03acf" X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.21 List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2016 23:56:45 -0000 --b1_f8e61a04e9e2478512267ca6bdd03acf Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit This revision was automatically updated to reflect the committed changes. Closed by commit rS298385: dhclient: Log a warning instead of bailing upon "illegal" options (authored by sephe). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D5853?vs=14915&id=15413#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D5853?vs=14915&id=15413 REVISION DETAIL https://reviews.freebsd.org/D5853 AFFECTED FILES head/sbin/dhclient/dhclient.c CHANGE DETAILS diff --git a/head/sbin/dhclient/dhclient.c b/head/sbin/dhclient/dhclient.c --- a/head/sbin/dhclient/dhclient.c +++ b/head/sbin/dhclient/dhclient.c @@ -2275,6 +2275,17 @@ { int i, j, namelen; + /* No `` or $() command substitution allowed in environment values! */ + for (j=0; j < strlen(value); j++) + switch (value[j]) { + case '`': + case '$': + warning("illegal character (%c) in value '%s'", + value[j], value); + /* Ignore this option */ + return; + } + namelen = strlen(name); for (i = 0; client->scriptEnv[i]; i++) @@ -2311,16 +2322,6 @@ strlen(value) + 1); if (client->scriptEnv[i] == NULL) error("script_set_env: no memory for variable assignment"); - - /* No `` or $() command substitution allowed in environment values! */ - for (j=0; j < strlen(value); j++) - switch (value[j]) { - case '`': - case '$': - error("illegal character (%c) in value '%s'", value[j], - value); - /* not reached */ - } snprintf(client->scriptEnv[i], strlen(prefix) + strlen(name) + 1 + strlen(value) + 1, "%s%s=%s", prefix, name, value); } EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: sepherosa_gmail.com, network, secteam, delphij, glebius, adrian, honzhan_microsoft.com, howard0su_gmail.com, decui_microsoft.com, freebsd-net-list, pkelsey, gnn, jhb Cc: sbruno --b1_f8e61a04e9e2478512267ca6bdd03acf Content-Type: text/x-patch; charset=utf-8; name="D5853.15413.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5853.15413.patch" ZGlmZiAtLWdpdCBhL2hlYWQvc2Jpbi9kaGNsaWVudC9kaGNsaWVudC5jIGIvaGVhZC9zYmluL2Ro Y2xpZW50L2RoY2xpZW50LmMKLS0tIGEvaGVhZC9zYmluL2RoY2xpZW50L2RoY2xpZW50LmMKKysr IGIvaGVhZC9zYmluL2RoY2xpZW50L2RoY2xpZW50LmMKQEAgLTIyNzUsNiArMjI3NSwxNyBAQAog ewogCWludCBpLCBqLCBuYW1lbGVuOwogCisJLyogTm8gYGAgb3IgJCgpIGNvbW1hbmQgc3Vic3Rp dHV0aW9uIGFsbG93ZWQgaW4gZW52aXJvbm1lbnQgdmFsdWVzISAqLworCWZvciAoaj0wOyBqIDwg c3RybGVuKHZhbHVlKTsgaisrKQorCQlzd2l0Y2ggKHZhbHVlW2pdKSB7CisJCWNhc2UgJ2AnOgor CQljYXNlICckJzoKKwkJCXdhcm5pbmcoImlsbGVnYWwgY2hhcmFjdGVyICglYykgaW4gdmFsdWUg JyVzJyIsCisJCQkgICAgdmFsdWVbal0sIHZhbHVlKTsKKwkJCS8qIElnbm9yZSB0aGlzIG9wdGlv biAqLworCQkJcmV0dXJuOworCQl9CisKIAluYW1lbGVuID0gc3RybGVuKG5hbWUpOwogCiAJZm9y IChpID0gMDsgY2xpZW50LT5zY3JpcHRFbnZbaV07IGkrKykKQEAgLTIzMTEsMTYgKzIzMjIsNiBA QAogCSAgICBzdHJsZW4odmFsdWUpICsgMSk7CiAJaWYgKGNsaWVudC0+c2NyaXB0RW52W2ldID09 IE5VTEwpCiAJCWVycm9yKCJzY3JpcHRfc2V0X2Vudjogbm8gbWVtb3J5IGZvciB2YXJpYWJsZSBh c3NpZ25tZW50Iik7Ci0KLQkvKiBObyBgYCBvciAkKCkgY29tbWFuZCBzdWJzdGl0dXRpb24gYWxs b3dlZCBpbiBlbnZpcm9ubWVudCB2YWx1ZXMhICovCi0JZm9yIChqPTA7IGogPCBzdHJsZW4odmFs dWUpOyBqKyspCi0JCXN3aXRjaCAodmFsdWVbal0pIHsKLQkJY2FzZSAnYCc6Ci0JCWNhc2UgJyQn OgotCQkJZXJyb3IoImlsbGVnYWwgY2hhcmFjdGVyICglYykgaW4gdmFsdWUgJyVzJyIsIHZhbHVl W2pdLAotCQkJICAgIHZhbHVlKTsKLQkJCS8qIG5vdCByZWFjaGVkICovCi0JCX0KIAlzbnByaW50 ZihjbGllbnQtPnNjcmlwdEVudltpXSwgc3RybGVuKHByZWZpeCkgKyBzdHJsZW4obmFtZSkgKwog CSAgICAxICsgc3RybGVuKHZhbHVlKSArIDEsICIlcyVzPSVzIiwgcHJlZml4LCBuYW1lLCB2YWx1 ZSk7CiB9Cgo= --b1_f8e61a04e9e2478512267ca6bdd03acf--