linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jitindar SIngh, Suraj" <surajjs@amazon.com>
To: "dan.carpenter@oracle.com" <dan.carpenter@oracle.com>,
	"tytso@mit.edu" <tytso@mit.edu>
Cc: "adilger.kernel@dilger.ca" <adilger.kernel@dilger.ca>,
	"linux-ext4@vger.kernel.org" <linux-ext4@vger.kernel.org>,
	"wharms@bfs.de" <wharms@bfs.de>,
	"kernel-janitors@vger.kernel.org"
	<kernel-janitors@vger.kernel.org>
Subject: Re: [PATCH] ext4: potential crash on allocation error in ext4_alloc_flex_bg_array()
Date: Fri, 28 Feb 2020 18:45:11 +0000	[thread overview]
Message-ID: <97e4ea8a96c28aa5e8659c5779c86643cade1f96.camel@amazon.com> (raw)
In-Reply-To: <20200228092142.7irbc44yaz3by7nb@kili.mountain>

On Fri, 2020-02-28 at 12:22 +0300, Dan Carpenter wrote:
> If sbi->s_flex_groups_allocated is zero and the first allocation
> fails
> then this code will crash.  The problem is that "i--" will set "i" to
> -1 but when we compare "i >= sbi->s_flex_groups_allocated" then the
> -1
> is type promoted to unsigned and becomes UINT_MAX.  Since UINT_MAX
> is more than zero, the condition is true so we call
> kvfree(new_groups[-1]).
> The loop will carry on freeing invalid memory until it crashes.
> 
> Fixes: 7c990728b99e ("ext4: fix potential race between s_flex_groups
> online resizing and access")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Suraj Jitindar Singh <surajjs@amazon.com>
Cc: <stable@kernel.org>

> ---
> I changed this from a -- loop to a ++ loop because I knew it would
> make
> Walter Harms happy.  He hates -- loops and I don't when his birthday
> so
> I'm celebrating it today.  :)
> 
>  fs/ext4/super.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index ff1b764b0c0e..0c7c4adb664e 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -2391,7 +2391,7 @@ int ext4_alloc_flex_bg_array(struct super_block
> *sb, ext4_group_t ngroup)
>  {
>  	struct ext4_sb_info *sbi = EXT4_SB(sb);
>  	struct flex_groups **old_groups, **new_groups;
> -	int size, i;
> +	int size, i, j;
>  
>  	if (!sbi->s_log_groups_per_flex)
>  		return 0;
> @@ -2412,8 +2412,8 @@ int ext4_alloc_flex_bg_array(struct super_block
> *sb, ext4_group_t ngroup)
>  					 sizeof(struct flex_groups)),
>  					 GFP_KERNEL);
>  		if (!new_groups[i]) {
> -			for (i--; i >= sbi->s_flex_groups_allocated; i-
> -)
> -				kvfree(new_groups[i]);
> +			for (j = sbi->s_flex_groups_allocated; j < i;
> j++)
> +				kvfree(new_groups[j]);
>  			kvfree(new_groups);
>  			ext4_msg(sb, KERN_ERR,
>  				 "not enough memory for %d flex
> groups", size);

      reply	other threads:[~2020-02-28 18:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-28  9:22 [PATCH] ext4: potential crash on allocation error in ext4_alloc_flex_bg_array() Dan Carpenter
2020-02-28 18:45 ` Jitindar SIngh, Suraj [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=97e4ea8a96c28aa5e8659c5779c86643cade1f96.camel@amazon.com \
    --to=surajjs@amazon.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=dan.carpenter@oracle.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    --cc=wharms@bfs.de \
    /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;
as well as URLs for NNTP newsgroup(s).