| Message ID | 1337652574-7132-1-git-send-email-tytso@mit.edu |
|---|---|
| State | Accepted, archived |
| Headers | show |
T29wcy4gVGhhbmtzIGZvciB0aGUgcGF0Y2guCgoKT24gTW9uLCBNYXkgMjEsIDIwMTIgYXQgNzow OSBQTSwgVGhlb2RvcmUgVHMnbyA8dHl0c29AbWl0LmVkdT4gd3JvdGU6Cj4gVGhlIG9wZXJhdG9y IHByZWNlZGVuY2UgYnVnIG1lYW5zIHRoYXQgd2UgbWlnaHQgcGF5IGF0dGVpb24gdG8KPiBzX2dy cF9xdW90YV9pbnVtIGV2ZW4gaWYgdGhlIFJPX0NPTVBBVF9RVU9UQSBmZWF0dXJlIGZsYWcgaXMg Y2xlYXIuCj4gSG93ZXZlciwgZm9ydHVuYXRlbHksIHRoaXMgaXMgdW5saWtlbHkgdG8gaGFwcGVu IGluIHByYWN0aWNlLgo+Cj4gQ2M6IEFkaXR5YSBLYWxpIDxhZGl0eWFrYWxpQGdvb2dsZS5jb20+ Cj4gU2lnbmVkLW9mZi1ieTogIlRoZW9kb3JlIFRzJ28iIDx0eXRzb0BtaXQuZWR1PgpSZXZpZXdl ZC1ieTogQWRpdHlhIEthbGkgPGFkaXR5YWthbGlAZ29vZ2xlLmNvbT4KPiAtLS0KPiDCoGUyZnNj ay9wYXNzMS5jIHwgwqAgwqA0ICsrLS0KPiDCoDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo KyksIDIgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZTJmc2NrL3Bhc3MxLmMgYi9lMmZz Y2svcGFzczEuYwo+IGluZGV4IGM3NjQ1ZDEuLmM2YWFlNmUgMTAwNjQ0Cj4gLS0tIGEvZTJmc2Nr L3Bhc3MxLmMKPiArKysgYi9lMmZzY2svcGFzczEuYwo+IEBAIC05MjgsOCArOTI4LDggQEAgdm9p ZCBlMmZzY2tfcGFzczEoZTJmc2NrX3QgY3R4KQo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgZXh0MmZzX21hcmtfaW5vZGVfYml0bWFwMihjdHgtPmlub2RlX3VzZWRfbWFwLCBp bm8pOwo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgaWYgKChmcy0+c3VwZXIt PnNfZmVhdHVyZV9yb19jb21wYXQgJgo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgRVhUNF9GRUFUVVJFX1JPX0NPTVBBVF9RVU9UQSkg JiYKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIChmcy0+c3VwZXIt PnNfdXNyX3F1b3RhX2ludW0gPT0gaW5vKSB8fAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgwqAgwqAgwqAgwqAgKGZzLT5zdXBlci0+c19ncnBfcXVvdGFfaW51bSA9PSBpbm8pKSB7Cj4g KyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCAoKGZzLT5zdXBlci0+c191 c3JfcXVvdGFfaW51bSA9PSBpbm8pIHx8Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oCDCoCDCoCDCoCDCoChmcy0+c3VwZXItPnNfZ3JwX3F1b3RhX2ludW0gPT0gaW5vKSkpIHsKPiDC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoGlmICghTElOVVhf U19JU1JFRyhpbm9kZS0+aV9tb2RlKSAmJgo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgZml4X3Byb2JsZW0oY3R4LCBQUl8xX1FVT1RBX0JBRF9N T0RFLAo+IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgJnBjdHgpKSB7Cj4gLS0KPiAxLjcuMTAu cmMzCj4KCgoKLS0gCgpBZGl0eWEK -- 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/e2fsck/pass1.c b/e2fsck/pass1.c index c7645d1..c6aae6e 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -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)) {
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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)