* [PATCH] jffs2: free jffs2_sb_info through jffs2_kill_sb()
@ 2018-10-06 9:09 Hou Tao
2018-10-16 5:52 ` Hou Tao
0 siblings, 1 reply; 5+ messages in thread
From: Hou Tao @ 2018-10-06 9:09 UTC (permalink / raw)
To: linux-mtd, linux-kernel; +Cc: dwmw2, stable
When an invalid mount option is passed to jffs2, jffs2_parse_options()
will fail and jffs2_sb_info will be freed, but then jffs2_sb_info will
be used (use-after-free) and freeed (double-free) in jffs2_kill_sb().
Fix it by removing the buggy invocation of kfree() when getting invalid
mount options.
Cc: stable@kernel.org
Signed-off-by: Hou Tao <houtao1@huawei.com>
---
fs/jffs2/super.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 87bdf0f4cba1..902a7dd10e5c 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -285,10 +285,8 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent)
sb->s_fs_info = c;
ret = jffs2_parse_options(c, data);
- if (ret) {
- kfree(c);
+ if (ret)
return -EINVAL;
- }
/* Initialize JFFS2 superblock locks, the further initialization will
* be done later */
--
2.16.2.dirty
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] jffs2: free jffs2_sb_info through jffs2_kill_sb()
2018-10-06 9:09 [PATCH] jffs2: free jffs2_sb_info through jffs2_kill_sb() Hou Tao
@ 2018-10-16 5:52 ` Hou Tao
2018-10-16 6:41 ` Richard Weinberger
0 siblings, 1 reply; 5+ messages in thread
From: Hou Tao @ 2018-10-16 5:52 UTC (permalink / raw)
To: linux-mtd, linux-kernel
Cc: dwmw2, stable, Arnd Bergmann, Al Viro, Brian Norris
ping ?
On 2018/10/6 17:09, Hou Tao wrote:
> When an invalid mount option is passed to jffs2, jffs2_parse_options()
> will fail and jffs2_sb_info will be freed, but then jffs2_sb_info will
> be used (use-after-free) and freeed (double-free) in jffs2_kill_sb().
>
> Fix it by removing the buggy invocation of kfree() when getting invalid
> mount options.
>
> Cc: stable@kernel.org
> Signed-off-by: Hou Tao <houtao1@huawei.com>
> ---
> fs/jffs2/super.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
> index 87bdf0f4cba1..902a7dd10e5c 100644
> --- a/fs/jffs2/super.c
> +++ b/fs/jffs2/super.c
> @@ -285,10 +285,8 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent)
> sb->s_fs_info = c;
>
> ret = jffs2_parse_options(c, data);
> - if (ret) {
> - kfree(c);
> + if (ret)
> return -EINVAL;
> - }
>
> /* Initialize JFFS2 superblock locks, the further initialization will
> * be done later */
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] jffs2: free jffs2_sb_info through jffs2_kill_sb()
2018-10-16 5:52 ` Hou Tao
@ 2018-10-16 6:41 ` Richard Weinberger
2018-10-16 10:26 ` Hou Tao
0 siblings, 1 reply; 5+ messages in thread
From: Richard Weinberger @ 2018-10-16 6:41 UTC (permalink / raw)
To: houtao1
Cc: linux-mtd @ lists . infradead . org, LKML, David Woodhouse,
stable, Arnd Bergmann, Al Viro, Brian Norris
On Tue, Oct 16, 2018 at 7:53 AM Hou Tao <houtao1@huawei.com> wrote:
>
> ping ?
>
> On 2018/10/6 17:09, Hou Tao wrote:
> > When an invalid mount option is passed to jffs2, jffs2_parse_options()
> > will fail and jffs2_sb_info will be freed, but then jffs2_sb_info will
> > be used (use-after-free) and freeed (double-free) in jffs2_kill_sb().
> >
> > Fix it by removing the buggy invocation of kfree() when getting invalid
> > mount options.
> >
> > Cc: stable@kernel.org
> > Signed-off-by: Hou Tao <houtao1@huawei.com>
> > ---
> > fs/jffs2/super.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
> > index 87bdf0f4cba1..902a7dd10e5c 100644
> > --- a/fs/jffs2/super.c
> > +++ b/fs/jffs2/super.c
> > @@ -285,10 +285,8 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent)
> > sb->s_fs_info = c;
> >
> > ret = jffs2_parse_options(c, data);
> > - if (ret) {
> > - kfree(c);
> > + if (ret)
> > return -EINVAL;
> > - }
Reviewed-by: Richard Weinberger <richard@nod.at>
We can carry this via the MTD tree.
--
Thanks,
//richard
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] jffs2: free jffs2_sb_info through jffs2_kill_sb()
2018-10-16 6:41 ` Richard Weinberger
@ 2018-10-16 10:26 ` Hou Tao
2018-10-16 11:49 ` Boris Brezillon
0 siblings, 1 reply; 5+ messages in thread
From: Hou Tao @ 2018-10-16 10:26 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-mtd @ lists . infradead . org, LKML, David Woodhouse,
stable, Arnd Bergmann, Al Viro, Brian Norris
On 2018/10/16 14:41, Richard Weinberger wrote:
> On Tue, Oct 16, 2018 at 7:53 AM Hou Tao <houtao1@huawei.com> wrote:
>>
>> ping ?
>>
>> On 2018/10/6 17:09, Hou Tao wrote:
>>> When an invalid mount option is passed to jffs2, jffs2_parse_options()
>>> will fail and jffs2_sb_info will be freed, but then jffs2_sb_info will
>>> be used (use-after-free) and freeed (double-free) in jffs2_kill_sb().
>>>
>>> Fix it by removing the buggy invocation of kfree() when getting invalid
>>> mount options.
>>>
>>> Cc: stable@kernel.org
>>> Signed-off-by: Hou Tao <houtao1@huawei.com>
>>> ---
>>> fs/jffs2/super.c | 4 +---
>>> 1 file changed, 1 insertion(+), 3 deletions(-)
>>>
>>> diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
>>> index 87bdf0f4cba1..902a7dd10e5c 100644
>>> --- a/fs/jffs2/super.c
>>> +++ b/fs/jffs2/super.c
>>> @@ -285,10 +285,8 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent)
>>> sb->s_fs_info = c;
>>>
>>> ret = jffs2_parse_options(c, data);
>>> - if (ret) {
>>> - kfree(c);
>>> + if (ret)
>>> return -EINVAL;
>>> - }
>
> Reviewed-by: Richard Weinberger <richard@nod.at>
>
> We can carry this via the MTD tree.
Thanks for that.
Regards,
Tao
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] jffs2: free jffs2_sb_info through jffs2_kill_sb()
2018-10-16 10:26 ` Hou Tao
@ 2018-10-16 11:49 ` Boris Brezillon
0 siblings, 0 replies; 5+ messages in thread
From: Boris Brezillon @ 2018-10-16 11:49 UTC (permalink / raw)
To: Hou Tao
Cc: Richard Weinberger, Arnd Bergmann, LKML,
linux-mtd @ lists . infradead . org, Al Viro, Brian Norris,
David Woodhouse, stable
On Tue, 16 Oct 2018 18:26:34 +0800
Hou Tao <houtao1@huawei.com> wrote:
> On 2018/10/16 14:41, Richard Weinberger wrote:
> > On Tue, Oct 16, 2018 at 7:53 AM Hou Tao <houtao1@huawei.com> wrote:
> >>
> >> ping ?
> >>
> >> On 2018/10/6 17:09, Hou Tao wrote:
> >>> When an invalid mount option is passed to jffs2, jffs2_parse_options()
> >>> will fail and jffs2_sb_info will be freed, but then jffs2_sb_info will
> >>> be used (use-after-free) and freeed (double-free) in jffs2_kill_sb().
> >>>
> >>> Fix it by removing the buggy invocation of kfree() when getting invalid
> >>> mount options.
> >>>
> >>> Cc: stable@kernel.org
> >>> Signed-off-by: Hou Tao <houtao1@huawei.com>
> >>> ---
> >>> fs/jffs2/super.c | 4 +---
> >>> 1 file changed, 1 insertion(+), 3 deletions(-)
> >>>
> >>> diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
> >>> index 87bdf0f4cba1..902a7dd10e5c 100644
> >>> --- a/fs/jffs2/super.c
> >>> +++ b/fs/jffs2/super.c
> >>> @@ -285,10 +285,8 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent)
> >>> sb->s_fs_info = c;
> >>>
> >>> ret = jffs2_parse_options(c, data);
> >>> - if (ret) {
> >>> - kfree(c);
> >>> + if (ret)
> >>> return -EINVAL;
> >>> - }
> >
> > Reviewed-by: Richard Weinberger <richard@nod.at>
> >
> > We can carry this via the MTD tree.
> Thanks for that.
Applied after adding
Fixes: 92abc475d8de ("jffs2: implement mount option parsing and compression overriding")
>
> Regards,
> Tao
>
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-16 11:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-06 9:09 [PATCH] jffs2: free jffs2_sb_info through jffs2_kill_sb() Hou Tao
2018-10-16 5:52 ` Hou Tao
2018-10-16 6:41 ` Richard Weinberger
2018-10-16 10:26 ` Hou Tao
2018-10-16 11:49 ` Boris Brezillon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.