From patchwork Thu Feb 21 12:26:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2171391 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4C15F3FD4E for ; Thu, 21 Feb 2013 12:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752868Ab3BUM00 (ORCPT ); Thu, 21 Feb 2013 07:26:26 -0500 Received: from mail-da0-f52.google.com ([209.85.210.52]:40975 "EHLO mail-da0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752395Ab3BUM0Y (ORCPT ); Thu, 21 Feb 2013 07:26:24 -0500 Received: by mail-da0-f52.google.com with SMTP id f10so4078629dak.39 for ; Thu, 21 Feb 2013 04:26:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=4ohKL8hiIhij2EhBbLUMTiuQwMQ4i1tZvTNT6WTst90=; b=WCoEcAz2Qa2Sbi3On8VTpcsit2cx+pVWCeZM1O8eakUrqxQM5OxJMaX3HByxUeO0V3 i5ovPrOxxZhhdKKaZOPaSVwD47/8AOUnOi4+rCEqxmDawVr7h8vf31eSZkvs/oy9CFVy D/WxLnX6uOQ3C3CkbKYIZINCHwRv8soVuQsM+xdx+BJxF+KnpfKuUAIBYB2j/NLaXJSZ xnyI72fQnwvB0dEHos6P4Sxws/5N7mfPdmEZaEn6tUFhfVcV5QIPeBK7JF1Sb9FcX2cw 0OOXYx+wMTkK8FnUQVXsj2Jg6TjrhjqqbL7uomdQm/okRs714XjhHeXDk+9w+2TCXiOh y0CQ== X-Received: by 10.68.216.39 with SMTP id on7mr5725818pbc.75.1361449582929; Thu, 21 Feb 2013 04:26:22 -0800 (PST) Received: from localhost.localdomain ([112.22.174.127]) by mx.google.com with ESMTPS id ab1sm25211464pbd.37.2013.02.21.04.26.19 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 21 Feb 2013 04:26:21 -0800 (PST) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: wangshilong1991@gmail.com Subject: [PATCH] Btrfs-progs: fix parse_limit function to return errors when parsing unit Date: Thu, 21 Feb 2013 20:26:15 +0800 Message-Id: <1361449575-1835-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Wang Shilong Steps to reproduce: btrfs qgroup limit m /subv Here, unit(k/K/g/G/m/M/t/T) all will trigger the problem. For the above command, the original code will parse the limit value as 0 and return successfully.It is wrong,fix it. Signed-off-by: Wang Shilong --- cmds-qgroup.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/cmds-qgroup.c b/cmds-qgroup.c index 1525c11..c75ef9b 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -214,6 +214,8 @@ static int parse_limit(const char *p, unsigned long long *s) { char *endptr; unsigned long long size; + int len = strlen(p); + int unit = 0; if (strcasecmp(p, "none") == 0) { *s = 0; @@ -232,6 +234,7 @@ static int parse_limit(const char *p, unsigned long long *s) size *= 1024; case 'K': case 'k': + unit = 1; size *= 1024; ++endptr; break; @@ -241,7 +244,11 @@ static int parse_limit(const char *p, unsigned long long *s) return 0; } - if (*endptr) + /* + * (len==1 && unit) means + * limit passed is like k,K,m,M,g,G,t,T. + */ + if (*endptr || (len == 1 && unit)) return 0; *s = size;