From owner-svn-src-head@freebsd.org Wed Jul 10 22:45:19 2019 Return-Path: Delivered-To: svn-src-head@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 6431115E550E for ; Wed, 10 Jul 2019 22:45:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) (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 E72F376005 for ; Wed, 10 Jul 2019 22:45:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x743.google.com with SMTP id s22so3254770qkj.12 for ; Wed, 10 Jul 2019 15:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ykoT1uMDs4NCvfO3taegKBo8/Qv5V7f3JtqTSl4DiFU=; b=aS+QYpInjXTiu9fQz1DjdIrlsNjQuTrSrumfU649g7Twv0rUf4WN86ARZzogJKWhjE 6o/M64xrf5el7RU+B/K/LJlfpp0LYvwWHvMUwlF69lOxSmU6AhkfQ8WFfIiftt6rrxmR g2rDi4PNJRXt+QCn5+mzwMedmdgaSM8N9+rTMmvznb2m2v53vPtlt5FYzTY7lXzbf0BY CaEXXvlOggGWELSN03ShcSmOF66UR1bH55BWClVPr3hS03n1m2AHhIyB3KX5QRQZYQDh iGPl1BDGAQtjkVUtl6Hb5vZwWTKRliuE+TVuHrIYcvgvuKO/9W/Xdg8TYKlWDDPlQ7ML MdeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ykoT1uMDs4NCvfO3taegKBo8/Qv5V7f3JtqTSl4DiFU=; b=DlHzHAU9ngCg/yqjcbnp5Q7dgcxEomeSKXqpeQS8enLcCuwzQ5f8n7tF7gxh1og5ze 0hZCw8WWPtqK3qQJaHcLmD0tOC/rBg/vU7DNlk1gK28S6YJ+pH46MEtU+xM83mT0Xxmq 93dPAHwrSa9kjI5DbGZGJW3qC7DJG6ojPc+lH5Eq2DwKxmZr3Kw+yoA+4SOhg2Bsaxxy fTCDvxGWuAhA81f5r9KguQwbgZlmL1qP3shmfobT6ZLc86wmbBOxCvBY01tpyjCBUV80 A+HEIkIG/Q3ijwVanOm4cXYxy5t3DH7G0axUAx/bgN4QAGyRAVJ55+N1WnsaWtQLPe7C BFmg== X-Gm-Message-State: APjAAAWYYl6qRgBf+wXZmzrWf65/l74yf3A4WvYAjUAAhdQKMWjF0Nq9 MNgzPbU+xysxvkux9fnCOqnauNFjEKLG3FxnlZs= X-Google-Smtp-Source: APXvYqztVah2TMPb2Pr/wDD+QiWsTEH4SLMN9FZc7dZIJRnRxt9CM+ek+JlIcjiXhe6+BmcAXXMhzjLFb77MCcVLKTU= X-Received: by 2002:a05:620a:1017:: with SMTP id z23mr547301qkj.60.1562798718040; Wed, 10 Jul 2019 15:45:18 -0700 (PDT) MIME-Version: 1.0 References: <201907101742.x6AHg4os016752@repo.freebsd.org> <20190710195548.kdftfemj3icarcxo@mutt-hbsd> <20190710151944.0fd94ec3@titan.knownspace> <20190710202218.yc3lcd6tsql3zkyr@mutt-hbsd> <20190710222918.vj4creizlubdzgw3@mutt-hbsd> <20190710224341.i3rbhapmpdw6gkbd@mutt-hbsd> In-Reply-To: <20190710224341.i3rbhapmpdw6gkbd@mutt-hbsd> From: Warner Losh Date: Wed, 10 Jul 2019 16:45:06 -0600 Message-ID: Subject: Re: svn commit: r349890 - head/contrib/telnet/telnet To: Shawn Webb Cc: Justin Hibbits , Philip Paeps , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: E72F376005 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2019 22:45:19 -0000 On Wed, Jul 10, 2019 at 4:43 PM Shawn Webb wrote: > On Wed, Jul 10, 2019 at 04:40:25PM -0600, Warner Losh wrote: > > On Wed, Jul 10, 2019 at 4:29 PM Shawn Webb > > wrote: > > > > > On Wed, Jul 10, 2019 at 04:22:18PM -0400, Shawn Webb wrote: > > > > On Wed, Jul 10, 2019 at 03:19:44PM -0500, Justin Hibbits wrote: > > > > > On Wed, 10 Jul 2019 15:55:48 -0400 > > > > > Shawn Webb wrote: > > > > > > > > > > > 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 > > > > > > > > > > > > > > Log: > > > > > > > telnet: fix a couple of snprintf() buffer overflows > > > > > > > > > > > > > > Obtained from: Juniper Networks > > > > > > > MFC after: 1 week > > > > > > > > > > > > > > Modified: > > > > > > > head/contrib/telnet/telnet/commands.c > > > > > > > head/contrib/telnet/telnet/telnet.c > > > > > > > head/contrib/telnet/telnet/utilities.c > > > > > > > > > > > > > > Modified: head/contrib/telnet/telnet/commands.c > > > > > > > > > > > ============================================================================== > > > > > > > --- head/contrib/telnet/telnet/commands.c Wed Jul 10 > > > > > > > 17:21:59 2019 (r349889) +++ > > > > > > > head/contrib/telnet/telnet/commands.c Wed Jul 10 17:42:04 > > > > > > > 2019 (r349890) @@ -1655,10 +1655,11 @@ env_init(void) char > > > > > > > hbuf[256+1]; char *cp2 = strchr((char *)ep->value, ':'); > > > > > > > > > > > > > > - gethostname(hbuf, 256); > > > > > > > - hbuf[256] = '\0'; > > > > > > > - cp = (char *)malloc(strlen(hbuf) + strlen(cp2) > + > > > > > > > 1); > > > > > > > - sprintf((char *)cp, "%s%s", hbuf, cp2); > > > > > > > + gethostname(hbuf, sizeof(hbuf)); > > > > > > > + hbuf[sizeof(hbuf)-1] = '\0'; > > > > > > > + unsigned int buflen = strlen(hbuf) + > strlen(cp2) + > > > > > > > 1; > > > > > > > > > > > > buflen should be defined with the rest of the variables in the > code > > > > > > block above this one. > > > > > > > > > > Agreed. > > > > > > > > > > > > > > > > > > + cp = (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. > > > > > > > > > > I'm not sure if this is actually a problem. env_init() is called > > > > > exactly once, at the beginning of main(), and the environment size > is > > > > > fully constrained by the OS. > > > > > > > > > > That said, this file it the only one in this component that does > not > > > > > check the return value of malloc(). All other uses, outside of > this > > > > > file, check and error. > > > > > > > > While fixing the style(9) violation above, we could still take care > of > > > > the potential NULL deref at the same time. If anything, just for code > > > > correctness reasons? > > > > > > Here's a patch: > > > > > > https://gist.github.com/579685c0252673c3ad92d2536c3486c7 > > > > > > Any reason to not use asprintf instead of malloc + snprintf? > > Because the existing code already used malloc + snprintf. And this is > contrib/telnet/telnet, which arguably should be `rm -rf`ed. ;) > > The bike shed is now glow-in-the-dark neon green. > I'm not in the rm-rf telnet camp... I use it far too often to connect to a port with good terminal support to want to do that... Warner