From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) by kanga.kvack.org (Postfix) with ESMTP id 00AD06B0035 for ; Fri, 8 Aug 2014 10:23:59 -0400 (EDT) Received: by mail-qg0-f42.google.com with SMTP id j5so6077555qga.15 for ; Fri, 08 Aug 2014 07:23:59 -0700 (PDT) Received: from relay.variantweb.net ([104.131.199.242]) by mx.google.com with ESMTP id b38si10424382qge.71.2014.08.08.07.23.59 for ; Fri, 08 Aug 2014 07:23:59 -0700 (PDT) Received: from mail (unknown [10.42.10.20]) by relay.variantweb.net (Postfix) with ESMTP id 855CE100ED2 for ; Fri, 8 Aug 2014 10:23:56 -0400 (EDT) Date: Fri, 8 Aug 2014 09:23:54 -0500 From: Seth Jennings Subject: Re: [PATCH] mm/zpool: use prefixed module loading Message-ID: <20140808142354.GA32313@cerebellum.variantweb.net> References: <20140808075316.GA21919@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140808075316.GA21919@www.outflux.net> Sender: owner-linux-mm@kvack.org List-ID: To: Kees Cook Cc: linux-kernel@vger.kernel.org, Minchan Kim , Nitin Gupta , Andrew Morton , Dan Streetman , Dan Carpenter , linux-mm@kvack.org On Fri, Aug 08, 2014 at 12:53:16AM -0700, Kees Cook 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). I didn't know that request_module() did string expansion. Thanks for the fix! Acked-by: Seth Jennings > > Signed-off-by: Kees Cook > --- > 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 "); > MODULE_DESCRIPTION("Buddy Allocator for Compressed Pages"); > +MODULE_ALIAS("zpool-zbud"); > 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); > 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 "); > +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: email@kvack.org