linux-kernel - Re: [UPDATE PATCH] mm: shmem: don't truncate page if memory failure happens

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sun, 14 Nov 2021 08:54:36 -0800
From:   Yang Shi <shy828301@...il.com>
To:     Matthew Wilcox <willy@...radead.org>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Arnd Bergmann <arnd@...db.de>, Hugh Dickins <hughd@...gle.com>,
        "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
        HORIGUCHI NAOYA(堀口 直也) 
        <naoya.horiguchi@....com>, Oscar Salvador <osalvador@...e.de>,
        Peter Xu <peterx@...hat.com>,
        Ajay Garg <ajaygargnsit@...il.com>,
        Muchun Song <songmuchun@...edance.com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Linux MM <linux-mm@...ck.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [UPDATE PATCH] mm: shmem: don't truncate page if memory failure happens

On Sun, Nov 14, 2021 at 7:28 AM Matthew Wilcox <willy@...radead.org> wrote:
>
> On Sat, Nov 13, 2021 at 09:32:21PM -0800, Yang Shi wrote:
> > @@ -2466,7 +2467,18 @@ shmem_write_begin(struct file *file, struct address_space *mapping,
> >                       return -EPERM;
> >       }
> >
> > -     return shmem_getpage(inode, index, pagep, SGP_WRITE);
> > +     ret = shmem_getpage(inode, index, pagep, SGP_WRITE);
> > +
> > +     if (ret)
> > +             return ret;
> > +
> > +     if (*pagep && PageHWPoison(*pagep)) {
> > +             unlock_page(*pagep);
> > +             put_page(*pagep);
> > +             ret = -EIO;
>
> You definitely need to add:
>
>                 *pagep = NULL;

Thanks, will do it.

>
> I'm not entirely convinced that you need the conditional on '*pagep'.
> If we returned 0, there had better be a page at pagep!

For SGP_WRITE, yes, it has a page at pagep if ret is 0, but
shmem_getpage() could return 0 with NULL page at pagep for SGP_READ.

In the other thread that Linus elaborated why this commit was reverted
and needed some rework, the discussion about not relying on
implementation detail for error handling taught me it may be not a
robust implementation to assume it is never NULL.

We might refactor shmem_getpage() code in the future to make sure when
it returns success there must be a valid pagep so that we just need to
care about the return value for error handling.

>
> I also think this would be clearer if written as:
>
>         if (PageHWPoison(*pagep)) {
>                 unlock_page(*pagep);
>                 put_page(*pagep);
>                 *pagep = NULL;
>                 return -EIO;
>         }
>
>         return 0;
>
> instead of re-using ret.  Sometimes that can make the code flow clearer,
> but here, I don't think it does.

Sure.

>
> > @@ -4168,9 +4201,12 @@ struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,
> >       error = shmem_getpage_gfp(inode, index, &page, SGP_CACHE,
> >                                 gfp, NULL, NULL, NULL);
> >       if (error)
> > -             page = ERR_PTR(error);
> > -     else
> > -             unlock_page(page);
> > +             return ERR_PTR(error);
> > +
> > +     unlock_page(page);
> > +     if (PageHWPoison(page))
> > +             return ERR_PTR(-EIO);
>
> Do we need to put_page() the page in this error case?

Aha, yes. Sorry for missing this. I was fooled by shmem_pin_map() in
i915 driver which does put page, but I realized it just puts the valid
pages pinned *before* meeting error page by second look
.
>