From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qudcz-0008Ue-NM for garchives@archives.gentoo.org; Sat, 20 Aug 2011 04:57:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0711DE0642; Sat, 20 Aug 2011 04:57:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C2AA1E063F for ; Sat, 20 Aug 2011 04:57:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B0B71B4087 for ; Sat, 20 Aug 2011 04:57:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1E8E180048 for ; Sat, 20 Aug 2011 04:57:36 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <21ca1ba3e5fc5f8e56cab7fdf67528932e3f5a87.vapier@gentoo> Subject: [gentoo-commits] proj/net-tools:gentoo commit in: / X-VCS-Repository: proj/net-tools X-VCS-Files: netstat.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 21ca1ba3e5fc5f8e56cab7fdf67528932e3f5a87 Date: Sat, 20 Aug 2011 04:57:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: cdcacf2bc788c35cd6d392a6da30fcff commit: 21ca1ba3e5fc5f8e56cab7fdf67528932e3f5a87 Author: Steve Grubb yahoo com> AuthorDate: Mon Apr 14 04:39:09 2008 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Aug 20 04:57:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/net-tools.git= ;a=3Dcommit;h=3D21ca1ba3 prevent overflows in interface buffers Fix originally from Steve Grubb: URL: https://bugzilla.redhat.com/120343 But later fixed by Rafa=C5=82 Mu=C5=BCy=C5=82o o2.pl>: URL: https://bugs.gentoo.org/298912#c3 --- netstat.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netstat.c b/netstat.c index 7b45fc8..4a4a147 100644 --- a/netstat.c +++ b/netstat.c @@ -945,7 +945,7 @@ static void tcp_do_one(int lnr, const char *line, con= st char *prot) } =20 strcat(local_addr, ":"); - strcat(local_addr, buffer); + strncat(local_addr, buffer, sizeof(local_addr)-strlen(local_addr)-1); snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT)); =20 @@ -955,7 +955,7 @@ static void tcp_do_one(int lnr, const char *line, con= st char *prot) } =20 strcat(rem_addr, ":"); - strcat(rem_addr, buffer); + strncat(rem_addr, buffer, sizeof(rem_addr)-strlen(rem_addr)-1); timers[0] =3D '\0'; =20 if (flag_opt) @@ -1095,7 +1095,7 @@ static void udp_do_one(int lnr, const char *line,co= nst char *prot) if ((strlen(local_addr) + strlen(buffer)) > 22) local_addr[22 - strlen(buffer)] =3D '\0'; strcat(local_addr, ":"); - strcat(local_addr, buffer); + strncat(local_addr, buffer, sizeof(local_addr)-strlen(local_addr)-1); =20 snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(rem_port), "udp", flag_not & FLAG_NUM_PORT)); @@ -1104,7 +1104,7 @@ static void udp_do_one(int lnr, const char *line,co= nst char *prot) if ((strlen(rem_addr) + strlen(buffer)) > 22) rem_addr[22 - strlen(buffer)] =3D '\0'; strcat(rem_addr, ":"); - strcat(rem_addr, buffer); + strncat(rem_addr, buffer, sizeof(rem_addr)-strlen(rem_addr)-1); =20 timers[0] =3D '\0'; if (flag_opt) @@ -1220,7 +1220,7 @@ static void raw_do_one(int lnr, const char *line,co= nst char *prot) if ((strlen(local_addr) + strlen(buffer)) > 22) local_addr[22 - strlen(buffer)] =3D '\0'; strcat(local_addr, ":"); - strcat(local_addr, buffer); + strncat(local_addr, buffer, sizeof(local_addr)-strlen(local_addr)-1); =20 snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(rem_port), "raw", flag_not & FLAG_NUM_PORT)); @@ -1229,7 +1229,7 @@ static void raw_do_one(int lnr, const char *line,co= nst char *prot) if ((strlen(rem_addr) + strlen(buffer)) > 22) rem_addr[22 - strlen(buffer)] =3D '\0'; strcat(rem_addr, ":"); - strcat(rem_addr, buffer); + strncat(rem_addr, buffer, sizeof(rem_addr)-strlen(rem_addr)-1); =20 timers[0] =3D '\0'; if (flag_opt)