From owner-svn-src-all@freebsd.org Wed Jul 10 19:55:54 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3523615E2155 for ; Wed, 10 Jul 2019 19:55:54 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1980D6F2C4 for ; Wed, 10 Jul 2019 19:55:53 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x831.google.com with SMTP id h24so3857267qto.0 for ; Wed, 10 Jul 2019 12:55:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=7NvUZXl9XAbn21ceC+wrjNVMtPTHxMqWu4vA3S6x0HI=; b=g+7C8JwNJjAMcb/TvEpGRTdgLY8NLMCywa9IY49+z65v1v575H3ellypZuBclEgyan GHnwYdo2RNxpzVgVFdutKlHjAvuhikQkmWRgqemF8bVHJdVSVX4WUUj7Af6DEkf6LO3t abIAFwjyJT0CVfRyOBGR7IQrcXKePSQh/YKLKIitAFv1JHGrxr9yvsHRwtftTMDefT7T /0iIVXdewiCI9H1PdySz9EzsW0hxNu2LUYEx6T4L6seCvSV3KHyaCH9HbZu/SexAUsXs ddLb+oPkpY/h2u9D/mv+yZRqYS2X79b6OiZNMjVXrX3lBCATEkDzGMZ0Hfi9cPmhZmA4 uEwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=7NvUZXl9XAbn21ceC+wrjNVMtPTHxMqWu4vA3S6x0HI=; b=csXhz1PHDM7XLMuKes4qu8pCvL0KpiKA5/9x1yruHj5CICzJOnP7g4eLLipOaVyjWd vc1WVWSq8i/I1GoRjZXRhlGKUkaroeIdwz8OGZvQXHDbNy0LHnPQrWxsx7oVWZ7n5RLG auJLORZ4MHUrLRZoE+8WR03mbKGms5fdTRYFEln8bjs3vPMdntn+BXf/dPziDSVCTXzP gZApaCdPbZjmVKFH2LP0fI0Xjn2EhmrFpa7V1KDTD7fYMHDUk4HJkG9dymT+2vaQNyB0 kUrQZTuaDrHfaTXBAwgIK3UzW5l7PHDQdjRyLB+LGn0knamcoliEYVQx27jGiPysU7KG L9Fw== X-Gm-Message-State: APjAAAW+sD3QpYOxxdWSSvctcCnv/ahoiuIGBct5ePi33bVIcUjzakK4 +JfWAbI/WWNPucrEkPTj15H46g== X-Google-Smtp-Source: APXvYqy4PjIXosf+TQ9hGnOD+5zGJnfN9zPhJnWmv3vdCM5U4JS+6z5lILa8XrIBNIpDN/4tmfSAAg== X-Received: by 2002:ac8:37b8:: with SMTP id d53mr25302514qtc.227.1562788551189; Wed, 10 Jul 2019 12:55:51 -0700 (PDT) Received: from mutt-hbsd ([151.196.118.239]) by smtp.gmail.com with ESMTPSA id p13sm1289774qkj.4.2019.07.10.12.55.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 10 Jul 2019 12:55:50 -0700 (PDT) Date: Wed, 10 Jul 2019 15:55:48 -0400 From: Shawn Webb To: Philip Paeps Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r349890 - head/contrib/telnet/telnet Message-ID: <20190710195548.kdftfemj3icarcxo@mutt-hbsd> References: <201907101742.x6AHg4os016752@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2ecdm7fv5dibptma" Content-Disposition: inline In-Reply-To: <201907101742.x6AHg4os016752@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: 1980D6F2C4 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2019 19:55:54 -0000 --2ecdm7fv5dibptma Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 10, 2019 at 05:42:04PM +0000, Philip Paeps wrote: > Author: philip > Date: Wed Jul 10 17:42:04 2019 > New Revision: 349890 > URL: https://svnweb.freebsd.org/changeset/base/349890 >=20 > Log: > telnet: fix a couple of snprintf() buffer overflows > =20 > Obtained from: Juniper Networks > MFC after: 1 week >=20 > Modified: > head/contrib/telnet/telnet/commands.c > head/contrib/telnet/telnet/telnet.c > head/contrib/telnet/telnet/utilities.c >=20 > Modified: head/contrib/telnet/telnet/commands.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/contrib/telnet/telnet/commands.c Wed Jul 10 17:21:59 2019 (r3498= 89) > +++ head/contrib/telnet/telnet/commands.c Wed Jul 10 17:42:04 2019 (r3498= 90) > @@ -1655,10 +1655,11 @@ env_init(void) > char hbuf[256+1]; > char *cp2 =3D strchr((char *)ep->value, ':'); > =20 > - gethostname(hbuf, 256); > - hbuf[256] =3D '\0'; > - cp =3D (char *)malloc(strlen(hbuf) + strlen(cp2) + 1); > - sprintf((char *)cp, "%s%s", hbuf, cp2); > + gethostname(hbuf, sizeof(hbuf)); > + hbuf[sizeof(hbuf)-1] =3D '\0'; > + unsigned int buflen =3D strlen(hbuf) + strlen(cp2) + 1; buflen should be defined with the rest of the variables in the code block above this one. > + cp =3D (char *)malloc(sizeof(char)*buflen); Lack of NULL check here leads to > + snprintf((char *)cp, buflen, "%s%s", hbuf, cp2); potential NULL pointer deref here. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 443-546-8752 Tor+XMPP+OTR: lattera@is.a.hacker.sx GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 --2ecdm7fv5dibptma Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl0mQrsACgkQ/y5nonf4 4foXOQ/9ELBZEj5TmLFUfNXJdo50Sm6Q6Bf6B4UG4SwK+aAKZImvRclY0XS9GmdC HIj6XXzRTtX+6MKrWFteJhsXM1EyBIrry2SK5f/BbBHGK6pXhzTlFeIAexfFGiGR z1qO6Rz7WeKQNgR11zMIPZardNRtotlAm4maUw5q4Nvr7LMley+BtxpdhlJ3Guv3 0GZdbmxaQZDJnWW7AJ9F+JXWMXdnIPlsR2g8nZts7GnFQ4IGvox4j7O4BA8ZoIfG E4yzQapVkBYKtmg9nrLkhNALJeit/CY2DDYTBJhcecALiJbpXrn2ZFlTH6lDnZN5 4REXybTlzhXeUQpwIEESHd8cIkTG2HjX155GwozBDIomdy1nHtHSWmKmHeyEq6gh 7qVtk4lfClmyazcCkcgK7Gx8fADzFT607Z4wNWLY0arZ+WGTUNVT4K0y+s8DYHTy hW3D5/sfNLPmPRPCz/uvTd+XGloaSUPgoHCB6SHLY+cFvMwuI5UpLjH0055o9FSN UZ8/y+oR2ITcZFVv9PEp440AKExnhqONMQ03M1Xan+GN4HQ61Px8lPxP+VRo7U2E xzCz1QMHfwWURBHW07kc8mZiEzrgYBIBx0WMs0PZnLvRXpXqtsNTGGy+3n+yA9DO ncJmY+A2nD9lg2CHvimC2/e/a1hrE8Z5KBW10zA9AqpyMrZPfpI= =2JuV -----END PGP SIGNATURE----- --2ecdm7fv5dibptma--