From patchwork Tue Oct 9 05:44:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Hongjiang X-Patchwork-Id: 190211 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 13A982C008F for ; Tue, 9 Oct 2012 16:45:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751645Ab2JIFo6 (ORCPT ); Tue, 9 Oct 2012 01:44:58 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:51446 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751536Ab2JIFo5 (ORCPT ); Tue, 9 Oct 2012 01:44:57 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr4so4714131pbb.19 for ; Mon, 08 Oct 2012 22:44:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=GBqT9TuhEXV/gPbcKrAl751xW0CTX91XpsjJ0IXgajY=; b=mUVmpeKAYMI4esEt5hd8j9qQ+gR6/bHS5Zfp4TMJT1Jh4T3Quo2Rexplv/yfNW4j0m SSLF3LZ2nER9Wj0P2HXmZSZVZFSls0P2ShoOZmlyERXckU3YxiL9B4dBhyufECjfe3Dy +tHM7QXgGV7FjLGZRWUqCvHWOSnlR3ANVxTJbhjYqdXaVpFq9MEMhCPLVZeaMMjwy87B CdYwWr+xyPYUa4lP1N9M47jKc0l27wEt3/EfneUnvj8yUzoYKCk2JBO5oJChyFLnVgX+ 2jFr+ky0KEHKVhiGgiTUmNb3UZnLWF8f1ar02sRjjI4bHn3GG+KywNrTB7LMdd1dmt6j izxQ== Received: by 10.68.232.71 with SMTP id tm7mr60635216pbc.118.1349761496801; Mon, 08 Oct 2012 22:44:56 -0700 (PDT) Received: from [192.168.204.180] ([218.17.215.175]) by mx.google.com with ESMTPS id ko8sm11850910pbc.40.2012.10.08.22.44.51 (version=SSLv3 cipher=OTHER); Mon, 08 Oct 2012 22:44:56 -0700 (PDT) Message-ID: <5073B9C4.9070009@gmail.com> Date: Tue, 09 Oct 2012 13:44:36 +0800 From: Zhao Hongjiang User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: jack@suse.cz CC: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Eric W. Biederman" , serge.hallyn@canonical.com, containers@lists.linux-foundation.org Subject: [PATCH] ext2: fix return values on parse_options() failure Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zhao Hongjiang parse_options() in ext2 should return 0 when parse the mount options fails. Signed-off-by: Zhao Hongjiang Reviewed-by: Lukas Czerner --- fs/ext2/super.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 6c205d0..fa04d02 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -469,7 +469,7 @@ static int parse_options(char *options, struct super_block *sb) uid = make_kuid(current_user_ns(), option); if (!uid_valid(uid)) { ext2_msg(sb, KERN_ERR, "Invalid uid value %d", option); - return -1; + return 0; } sbi->s_resuid = uid; @@ -480,7 +480,7 @@ static int parse_options(char *options, struct super_block *sb) gid = make_kgid(current_user_ns(), option); if (!gid_valid(gid)) { ext2_msg(sb, KERN_ERR, "Invalid gid value %d", option); - return -1; + return 0; } sbi->s_resgid = gid; break;