From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755624AbaHHHxd (ORCPT ); Fri, 8 Aug 2014 03:53:33 -0400 Received: from smtp.outflux.net ([198.145.64.163]:58170 "EHLO smtp.outflux.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbaHHHxb (ORCPT ); Fri, 8 Aug 2014 03:53:31 -0400 Date: Fri, 8 Aug 2014 00:53:16 -0700 From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Seth Jennings , Minchan Kim , Nitin Gupta , Andrew Morton , Dan Streetman , Dan Carpenter , linux-mm@kvack.org Subject: [PATCH] mm/zpool: use prefixed module loading Message-ID: <20140808075316.GA21919@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-HELO: www.outflux.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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