mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chao Yu <yuchao0@huawei.com>
To: Joe Perches <joe@perches.com>, <jaegeuk@kernel.org>
Cc: <linux-f2fs-devel@lists.sourceforge.net>,
	<linux-kernel@vger.kernel.org>, <chao@kernel.org>
Subject: Re: [PATCH v3] f2fs: fix potential .flags overflow on 32bit architecture
Date: Mon, 23 Mar 2020 10:19:44 +0800	[thread overview]
Message-ID: <68bc1967-8772-d04a-1209-d919bf122f9f@huawei.com> (raw)
In-Reply-To: <ed37a2a18060f71accb202c05724c0b66d0aa9f7.camel@perches.com>

On 2020/3/23 10:00, Joe Perches wrote:
> On Mon, 2020-03-23 at 09:25 +0800, Chao Yu wrote:
>> f2fs_inode_info.flags is unsigned long variable, it has 32 bits
>> in 32bit architecture, since we introduced FI_MMAP_FILE flag
>> when we support data compression, we may access memory cross
>> the border of .flags field, corrupting .i_sem field, result in
>> below deadlock.
>>
>> To fix this issue, let's expand .flags as an array to grab enough
>> space to store new flags.
> []
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> []
>> @@ -2586,22 +2590,28 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,
>>  	}
>>  }
>>  
>> +static inline void __set_inode_flag(struct inode *inode, int flag)
>> +{
>> +	test_and_set_bit(flag % BITS_PER_LONG,
>> +			&F2FS_I(inode)->flags[BIT_WORD(flag)]);
> 
> I believe this should just use
> 
> 	test_and_set_bit(flag, F2FS_I(inode)->flags);
> 
>>  static inline int is_inode_flag_set(struct inode *inode, int flag)
>>  {
>> -	return test_bit(flag, &F2FS_I(inode)->flags);
>> +	return test_bit(flag % BITS_PER_LONG,
>> +				&F2FS_I(inode)->flags[BIT_WORD(flag)]);
> 
> here too.
> 
> 	test_bit(flag, F2FS_I(inode)->flags);
> 
>>  static inline void clear_inode_flag(struct inode *inode, int flag)
>>  {
>> -	if (test_bit(flag, &F2FS_I(inode)->flags))
>> -		clear_bit(flag, &F2FS_I(inode)->flags);
>> +	test_and_clear_bit(flag % BITS_PER_LONG,
>> +				&F2FS_I(inode)->flags[BIT_WORD(flag)]);
> 
> and here.

My bad, Ondřej Jirman also reminded me this issue, will fix this soon.

Thanks,

> 
> I also don't know why these functions are used at all.
> 
> 
> .
> 

      reply	other threads:[~2020-03-23  2:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23  1:25 Chao Yu
2020-03-23  1:50 ` Ondřej Jirman
2020-03-23  2:09   ` Chao Yu
2020-03-23  2:00 ` Joe Perches
2020-03-23  2:19   ` Chao Yu [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=68bc1967-8772-d04a-1209-d919bf122f9f@huawei.com \
    --to=yuchao0@huawei.com \
    --cc=chao@kernel.org \
    --cc=jaegeuk@kernel.org \
    --cc=joe@perches.com \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®