From patchwork Sun Nov 23 09:16:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 5360281 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 058BBC11AC for ; Sun, 23 Nov 2014 09:16:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D48B20253 for ; Sun, 23 Nov 2014 09:16:31 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1D585200C6 for ; Sun, 23 Nov 2014 09:16:28 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id B1C302615BF; Sun, 23 Nov 2014 10:16:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 84CB42605A6; Sun, 23 Nov 2014 10:16:14 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 33A64261513; Sun, 23 Nov 2014 10:16:12 +0100 (CET) Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 3F4FD2605A4 for ; Sun, 23 Nov 2014 10:16:04 +0100 (CET) Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 00EF1AAF1 for ; Sun, 23 Nov 2014 09:16:03 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Date: Sun, 23 Nov 2014 10:16:02 +0100 Message-Id: <1416734162-24748-2-git-send-email-tiwai@suse.de> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1416734162-24748-1-git-send-email-tiwai@suse.de> References: <1416734162-24748-1-git-send-email-tiwai@suse.de> Subject: [alsa-devel] [PATCH 2/2] amixer: Parse the value more strictly X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP So far amixer allows some unexpected suffix and assumes as a raw absolute value without returning an error. This is rather dangerous, e.g. user might not notice that a completely wrong value was set when the command line included a typo. This patch makes the parser a bit more strict: it doesn't allow any longer invalid suffixes, instead either returns an error or skips the invalid value, depending on the operation mode. Signed-off-by: Takashi Iwai --- amixer/amixer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/amixer/amixer.c b/amixer/amixer.c index 6a2fdb96c62f..ed60e7c3a960 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -325,7 +325,7 @@ static int set_volume_simple(snd_mixer_elem_t *elem, long val, orig, pmin, pmax; char *p = *ptr, *s; int invalid = 0, percent = 0, err = 0; - int vol_type = std_vol_type; + int vol_type; double scale = 1.0; int correct = 0; @@ -344,14 +344,19 @@ static int set_volume_simple(snd_mixer_elem_t *elem, strtol(p, &p, 10); } if (*p == '%') { + vol_type = std_vol_type; percent = 1; p++; } else if (toupper(p[0]) == 'D' && toupper(p[1]) == 'B') { vol_type = VOL_DB; p += 2; scale = 100; - } else + } else { vol_type = VOL_RAW; + } + + if (*p && !strchr(",:+-", *p)) + invalid = 1; val = (long)(strtod(s, NULL) * scale); if (vol_ops[dir].v[vol_type].get_range(elem, &pmin, &pmax) < 0) @@ -372,6 +377,10 @@ static int set_volume_simple(snd_mixer_elem_t *elem, } p++; } + + if (*p && !strchr(",:", *p)) + invalid = 1; + if (! invalid) { val = check_range(val, pmin, pmax); err = vol_ops[dir].v[vol_type].set(elem, chn, val, correct);