From owner-svn-src-stable-10@freebsd.org  Thu May  4 14:55:08 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 976D2D5DF84;
 Thu,  4 May 2017 14:55:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6792016BD;
 Thu,  4 May 2017 14:55:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v44Et79R011427;
 Thu, 4 May 2017 14:55:07 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v44Et7nn011426;
 Thu, 4 May 2017 14:55:07 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201705041455.v44Et7nn011426@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 4 May 2017 14:55:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r317796 - stable/10/usr.sbin/mixer
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 May 2017 14:55:08 -0000

Author: pfg
Date: Thu May  4 14:55:07 2017
New Revision: 317796
URL: https://svnweb.freebsd.org/changeset/base/317796

Log:
  MFC r317596:
  mixer(8): Prevent possible sscanf() overflow.
  
  Fix %s buffer sizes in sscanf().
  
  Obtained from:	DragonflyBSD (git dab952e2)

Modified:
  stable/10/usr.sbin/mixer/mixer.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/mixer/mixer.c
==============================================================================
--- stable/10/usr.sbin/mixer/mixer.c	Thu May  4 14:54:22 2017	(r317795)
+++ stable/10/usr.sbin/mixer/mixer.c	Thu May  4 14:55:07 2017	(r317796)
@@ -102,7 +102,7 @@ int
 main(int argc, char *argv[])
 {
 	char	mixer[PATH_MAX] = "/dev/mixer";
-	char	lstr[5], rstr[5];
+	char	lstr[8], rstr[8];
 	char	*name, *eptr;
 	int	devmask = 0, recmask = 0, recsrc = 0, orecsrc;
 	int	dusage = 0, drecsrc = 0, sflag = 0, Sflag = 0;