linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Dan Streetman <ddstreet@ieee.org>
To: Kees Cook <keescook@chromium.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
	Seth Jennings <sjennings@variantweb.net>,
	Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Linux-MM <linux-mm@kvack.org>
Subject: Re: [PATCH] mm/zpool: use prefixed module loading
Date: Fri, 8 Aug 2014 13:11:55 -0400	[thread overview]
Message-ID: <CALZtONBNEg7kzUtwKihQuAU48MNh5NjhZcWoOxe-1-vgWqSLiw@mail.gmail.com> (raw)
In-Reply-To: <20140808075316.GA21919@www.outflux.net>

On Fri, Aug 8, 2014 at 3:53 AM, Kees Cook <keescook@chromium.org> wrote:
> To avoid potential format string expansion via module parameters,
> do not use the zpool type directly in request_module() without a
> format string. Additionally, to avoid arbitrary modules being loaded
> via zpool API (e.g. via the zswap_zpool_type module parameter) add a
> "zpool-" prefix to the requested module, as well as module aliases for
> the existing zpool types (zbud and zsmalloc).
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>  mm/zbud.c     | 1 +
>  mm/zpool.c    | 2 +-
>  mm/zsmalloc.c | 1 +
>  3 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/mm/zbud.c b/mm/zbud.c
> index a05790b1915e..aa74f7addab1 100644
> --- a/mm/zbud.c
> +++ b/mm/zbud.c
> @@ -619,3 +619,4 @@ module_exit(exit_zbud);
>  MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Seth Jennings <sjenning@linux.vnet.ibm.com>");
>  MODULE_DESCRIPTION("Buddy Allocator for Compressed Pages");
> +MODULE_ALIAS("zpool-zbud");

If we keep this, I'd recommend putting this inside the #ifdef
CONFIG_ZPOOL section, to keep all the zpool stuff together in zbud and
zsmalloc.

> diff --git a/mm/zpool.c b/mm/zpool.c
> index e40612a1df00..739cdf0d183a 100644
> --- a/mm/zpool.c
> +++ b/mm/zpool.c
> @@ -150,7 +150,7 @@ struct zpool *zpool_create_pool(char *type, gfp_t gfp, struct zpool_ops *ops)
>         driver = zpool_get_driver(type);
>
>         if (!driver) {
> -               request_module(type);
> +               request_module("zpool-%s", type);

I agree with a change of (type) to ("%s", type), but what's the need
to prefix "zpool-"?  Anyone who has access to modify the
zswap_zpool_type parameter is already root and can just as easily load
any module they want.  Additionally, the zswap_compressor parameter
also runs through request_module() (in crypto/api.c) and could be used
to load any kernel module.

I'd prefer to leave out the "zpool-" prefix unless there is a specific
reason to include it.

>                 driver = zpool_get_driver(type);
>         }
>
> diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
> index 4e2fc83cb394..36af729eb3f6 100644
> --- a/mm/zsmalloc.c
> +++ b/mm/zsmalloc.c
> @@ -1199,3 +1199,4 @@ module_exit(zs_exit);
>
>  MODULE_LICENSE("Dual BSD/GPL");
>  MODULE_AUTHOR("Nitin Gupta <ngupta@vflare.org>");
> +MODULE_ALIAS("zpool-zsmalloc");
> --
> 1.9.1
>
>
> --
> Kees Cook
> Chrome OS Security
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org.  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2014-08-08 17:12 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-08  7:53 Kees Cook
2014-08-08 14:23 ` Seth Jennings
2014-08-08 17:11 ` Dan Streetman [this message]
2014-08-08 22:05   ` Seth Jennings
2014-08-09  0:06   ` Kees Cook
2014-08-09  1:46     ` Dan Streetman
2014-08-09  3:08     ` Herbert Xu
2014-08-12  0:42       ` Dan Streetman
2014-08-12 19:07       ` Kees Cook
2014-08-09 14:18     ` Greg KH

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=CALZtONBNEg7kzUtwKihQuAU48MNh5NjhZcWoOxe-1-vgWqSLiw@mail.gmail.com \
    --to=ddstreet@ieee.org \
    --cc=akpm@linux-foundation.org \
    --cc=dan.carpenter@oracle.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=minchan@kernel.org \
    --cc=ngupta@vflare.org \
    --cc=sjennings@variantweb.net \
    /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