1. Patchew
  2. linux
  3. View series

[PATCH] mm: Remove usercopy_warn()

Christophe Leroy posted 1 patch 4 years, 4 months ago 
include/linux/uaccess.h |  2 --
mm/usercopy.c           | 11 -----------
2 files changed, 13 deletions(-)
[PATCH] mm: Remove usercopy_warn()
Posted by Christophe Leroy 4 years, 4 months ago 
Users of usercopy_warn() were removed by
commit 53944f171a89 ("mm: remove HARDENED_USERCOPY_FALLBACK")

Remote it.

Cc: Stephen Kitt <steve@sk2.org>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 include/linux/uaccess.h |  2 --
 mm/usercopy.c           | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index ac0394087f7d..bca27b4e5eb2 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -401,8 +401,6 @@ static inline void user_access_restore(unsigned long flags) { }
 #endif
 
 #ifdef CONFIG_HARDENED_USERCOPY
-void usercopy_warn(const char *name, const char *detail, bool to_user,
-		   unsigned long offset, unsigned long len);
 void __noreturn usercopy_abort(const char *name, const char *detail,
 			       bool to_user, unsigned long offset,
 			       unsigned long len);
diff --git a/mm/usercopy.c b/mm/usercopy.c
index d0d268135d96..e7b0cb49daa1 100644
--- a/mm/usercopy.c
+++ b/mm/usercopy.c
@@ -70,17 +70,6 @@ static noinline int check_stack_object(const void *obj, unsigned long len)
  * kmem_cache_create_usercopy() function to create the cache (and
  * carefully audit the whitelist range).
  */
-void usercopy_warn(const char *name, const char *detail, bool to_user,
-		   unsigned long offset, unsigned long len)
-{
-	WARN_ONCE(1, "Bad or missing usercopy whitelist? Kernel memory %s attempt detected %s %s%s%s%s (offset %lu, size %lu)!\n",
-		 to_user ? "exposure" : "overwrite",
-		 to_user ? "from" : "to",
-		 name ? : "unknown?!",
-		 detail ? " '" : "", detail ? : "", detail ? "'" : "",
-		 offset, len);
-}
-
 void __noreturn usercopy_abort(const char *name, const char *detail,
 			       bool to_user, unsigned long offset,
 			       unsigned long len)
-- 
2.33.1
Re: [PATCH] mm: Remove usercopy_warn()
Posted by Miaohe Lin 4 years, 4 months ago 
On 2022/2/7 19:05, Christophe Leroy wrote:
> Users of usercopy_warn() were removed by
> commit 53944f171a89 ("mm: remove HARDENED_USERCOPY_FALLBACK")
> 
> Remote it.

s/Remote/Remove/

Except the above nit, this patch looks good to me. Thanks.

Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>

> 
> Cc: Stephen Kitt <steve@sk2.org>
> Cc: Kees Cook <keescook@chromium.org>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
>  include/linux/uaccess.h |  2 --
>  mm/usercopy.c           | 11 -----------
>  2 files changed, 13 deletions(-)
> 
> diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
> index ac0394087f7d..bca27b4e5eb2 100644
> --- a/include/linux/uaccess.h
> +++ b/include/linux/uaccess.h
> @@ -401,8 +401,6 @@ static inline void user_access_restore(unsigned long flags) { }
>  #endif
>  
>  #ifdef CONFIG_HARDENED_USERCOPY
> -void usercopy_warn(const char *name, const char *detail, bool to_user,
> -		   unsigned long offset, unsigned long len);
>  void __noreturn usercopy_abort(const char *name, const char *detail,
>  			       bool to_user, unsigned long offset,
>  			       unsigned long len);
> diff --git a/mm/usercopy.c b/mm/usercopy.c
> index d0d268135d96..e7b0cb49daa1 100644
> --- a/mm/usercopy.c
> +++ b/mm/usercopy.c
> @@ -70,17 +70,6 @@ static noinline int check_stack_object(const void *obj, unsigned long len)
>   * kmem_cache_create_usercopy() function to create the cache (and
>   * carefully audit the whitelist range).
>   */
> -void usercopy_warn(const char *name, const char *detail, bool to_user,
> -		   unsigned long offset, unsigned long len)
> -{
> -	WARN_ONCE(1, "Bad or missing usercopy whitelist? Kernel memory %s attempt detected %s %s%s%s%s (offset %lu, size %lu)!\n",
> -		 to_user ? "exposure" : "overwrite",
> -		 to_user ? "from" : "to",
> -		 name ? : "unknown?!",
> -		 detail ? " '" : "", detail ? : "", detail ? "'" : "",
> -		 offset, len);
> -}
> -
>  void __noreturn usercopy_abort(const char *name, const char *detail,
>  			       bool to_user, unsigned long offset,
>  			       unsigned long len)
>
Re: [PATCH] mm: Remove usercopy_warn()
Posted by Stephen Kitt 4 years, 4 months ago 
On Mon, 7 Feb 2022 20:25:19 +0800, Miaohe Lin <linmiaohe@huawei.com> wrote:

> On 2022/2/7 19:05, Christophe Leroy wrote:
> > Users of usercopy_warn() were removed by
> > commit 53944f171a89 ("mm: remove HARDENED_USERCOPY_FALLBACK")
> > 
> > Remote it.  
> 
> s/Remote/Remove/
> 
> Except the above nit, this patch looks good to me. Thanks.
> 
> Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>

Likewise,

Reviewed-by: Stephen Kitt <steve@sk2.org>


> > 
> > Cc: Stephen Kitt <steve@sk2.org>
> > Cc: Kees Cook <keescook@chromium.org>
> > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> > ---
> >  include/linux/uaccess.h |  2 --
> >  mm/usercopy.c           | 11 -----------
> >  2 files changed, 13 deletions(-)
> > 
> > diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
> > index ac0394087f7d..bca27b4e5eb2 100644
> > --- a/include/linux/uaccess.h
> > +++ b/include/linux/uaccess.h
> > @@ -401,8 +401,6 @@ static inline void user_access_restore(unsigned long
> > flags) { } #endif
> >  
> >  #ifdef CONFIG_HARDENED_USERCOPY
> > -void usercopy_warn(const char *name, const char *detail, bool to_user,
> > -		   unsigned long offset, unsigned long len);
> >  void __noreturn usercopy_abort(const char *name, const char *detail,
> >  			       bool to_user, unsigned long offset,
> >  			       unsigned long len);
> > diff --git a/mm/usercopy.c b/mm/usercopy.c
> > index d0d268135d96..e7b0cb49daa1 100644
> > --- a/mm/usercopy.c
> > +++ b/mm/usercopy.c
> > @@ -70,17 +70,6 @@ static noinline int check_stack_object(const void
> > *obj, unsigned long len)
> >   * kmem_cache_create_usercopy() function to create the cache (and
> >   * carefully audit the whitelist range).
> >   */
> > -void usercopy_warn(const char *name, const char *detail, bool to_user,
> > -		   unsigned long offset, unsigned long len)
> > -{
> > -	WARN_ONCE(1, "Bad or missing usercopy whitelist? Kernel memory
> > %s attempt detected %s %s%s%s%s (offset %lu, size %lu)!\n",
> > -		 to_user ? "exposure" : "overwrite",
> > -		 to_user ? "from" : "to",
> > -		 name ? : "unknown?!",
> > -		 detail ? " '" : "", detail ? : "", detail ? "'" : "",
> > -		 offset, len);
> > -}
> > -
> >  void __noreturn usercopy_abort(const char *name, const char *detail,
> >  			       bool to_user, unsigned long offset,
> >  			       unsigned long len)
> >   
>
Re: [PATCH] mm: Remove usercopy_warn()
Posted by Muchun Song 4 years, 4 months ago 
On Mon, Feb 7, 2022 at 7:16 PM Christophe Leroy
<christophe.leroy@csgroup.eu> wrote:
>
> Users of usercopy_warn() were removed by
> commit 53944f171a89 ("mm: remove HARDENED_USERCOPY_FALLBACK")
>
> Remote it.
>
> Cc: Stephen Kitt <steve@sk2.org>
> Cc: Kees Cook <keescook@chromium.org>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>

Reviewed-by: Muchun Song <songmuchun@bytedance.com>

Thanks.

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.