From: Joe Perches <joe@perches.com>
To: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: Re: [PATCH] mm: util: update the kerneldoc for kstrdup_const()
Date: Sun, 28 Jun 2020 11:20:45 -0700 [thread overview]
Message-ID: <131b9e2f6caeb46770374ffcb743a9541b51c2ce.camel@perches.com> (raw)
In-Reply-To: <CAMRc=MciqbwHBPJf1w2m3xa6ZxbX7=Ca9ucEeyVaKa+FWPzu7A@mail.gmail.com>
On Sun, 2020-06-28 at 20:06 +0200, Bartosz Golaszewski wrote:
> On Sun, Jun 28, 2020 at 7:37 PM Joe Perches <joe@perches.com> wrote:
> > On Sun, 2020-06-28 at 17:25 +0200, Bartosz Golaszewski wrote:
> > > From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> > >
> > > Memory allocated with kstrdup_const() must not be passed to regular
> > > krealloc() as it is not aware of the possibility of the chunk residing
> > > in .rodata. Since there are no potential users of krealloc_const()
> > > at the moment, let's just update the doc to make it explicit.
> >
> > Another option would be to return NULL if it's
> > used from krealloc with a pointer into rodata
> > ---
> > mm/slab_common.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/mm/slab_common.c b/mm/slab_common.c
> > index 37d48a56431d..f8b49656171b 100644
> > --- a/mm/slab_common.c
> > +++ b/mm/slab_common.c
> > @@ -1683,6 +1683,9 @@ static __always_inline void *__do_krealloc(const void *p, size_t new_size,
> > * @new_size: how many bytes of memory are required.
> > * @flags: the type of memory to allocate.
> > *
> > + * If the object pointed to is in rodata (likely from kstrdup_const)
> > + * %NULL is returned.
> > + *
> > * The contents of the object pointed to are preserved up to the
> > * lesser of the new and old sizes. If @p is %NULL, krealloc()
> > * behaves exactly like kmalloc(). If @new_size is 0 and @p is not a
> > @@ -1694,6 +1697,9 @@ void *krealloc(const void *p, size_t new_size, gfp_t flags)
> > {
> > void *ret;
> >
> > + if (unlikely(is_kernel_rodata((unsigned long)p)))
> > + return NULL;
> > +
> > if (unlikely(!new_size)) {
> > kfree(p);
> > return ZERO_SIZE_PTR;
> >
> >
> >
>
> In that case we should probably add a WARN_ON() - otherwise the user
> will be baffled by krealloc() failing.
Maybe:
---
mm/slab_common.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/mm/slab_common.c b/mm/slab_common.c
index a143a8c8f874..06c2714ab8c9 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -1073,6 +1073,9 @@ static __always_inline void *__do_krealloc(const void *p, size_t new_size,
* @new_size: how many bytes of memory are required.
* @flags: the type of memory to allocate.
*
+ * If the object pointed to is in rodata (likely from kstrdup_const)
+ * %NULL is returned.
+ *
* The contents of the object pointed to are preserved up to the
* lesser of the new and old sizes. If @p is %NULL, krealloc()
* behaves exactly like kmalloc(). If @new_size is 0 and @p is not a
@@ -1084,6 +1087,14 @@ void *krealloc(const void *p, size_t new_size, gfp_t flags)
{
void *ret;
+ if (unlikely(is_kernel_rodata((unsigned long)p))) {
+ if (!(flags & __GFP_NOWARN)) {
+ printk(KERN_DEFAULT "invalid use of krealloc with const rodata\n");
+ dump_stack();
+ }
+ return NULL;
+ }
+
if (unlikely(!new_size)) {
kfree(p);
return ZERO_SIZE_PTR;
next prev parent reply other threads:[~2020-06-28 18:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-28 15:25 [PATCH] mm: util: update the kerneldoc for kstrdup_const() Bartosz Golaszewski
2020-06-28 17:37 ` Joe Perches
2020-06-28 18:06 ` Bartosz Golaszewski
2020-06-28 18:20 ` Joe Perches [this message]
2020-06-29 10:54 ` David Hildenbrand
2020-06-29 19:21 ` Joe Perches
2020-06-30 8:57 ` David Hildenbrand
2020-06-30 14:14 ` Joe Perches
2020-06-30 14:36 ` David Hildenbrand
2020-06-30 14:51 ` Joe Perches
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=131b9e2f6caeb46770374ffcb743a9541b51c2ce.camel@perches.com \
--to=joe@perches.com \
--cc=akpm@linux-foundation.org \
--cc=bgolaszewski@baylibre.com \
--cc=brgl@bgdev.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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;
as well as URLs for NNTP newsgroup(s).