Whamcloud - gitweb
e2fsck: fix precedence bug in built-in quota support
authorTheodore Ts'o <tytso@mit.edu>
Tue, 22 May 2012 01:58:39 +0000 (21:58 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 22 May 2012 02:08:13 +0000 (22:08 -0400)
The operator precedence bug means that we might pay atteion to
s_grp_quota_inum even if the RO_COMPAT_QUOTA feature flag is clear.
However, fortunately, this is unlikely to happen in practice.

Cc: Aditya Kali <adityakali@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
e2fsck/pass1.c

index c7645d1..c6aae6e 100644 (file)
@@ -928,8 +928,8 @@ void e2fsck_pass1(e2fsck_t ctx)
                        ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
                        if ((fs->super->s_feature_ro_compat &
                                        EXT4_FEATURE_RO_COMPAT_QUOTA) &&
-                           (fs->super->s_usr_quota_inum == ino) ||
-                           (fs->super->s_grp_quota_inum == ino)) {
+                           ((fs->super->s_usr_quota_inum == ino) ||
+                            (fs->super->s_grp_quota_inum == ino))) {
                                if (!LINUX_S_ISREG(inode->i_mode) &&
                                    fix_problem(ctx, PR_1_QUOTA_BAD_MODE,
                                                        &pctx)) {