From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933899AbdJRCFU (ORCPT ); Tue, 17 Oct 2017 22:05:20 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:55268 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933582AbdJRCEs (ORCPT ); Tue, 17 Oct 2017 22:04:48 -0400 X-Google-Smtp-Source: AOwi7QBn324+6R9wulcmI2MJgTx4YghVikWSywTLTwMQ3VIH8/rl3gOcvzPSgqipmR1xodqf3bdyLA== From: Kees Cook To: Jessica Yu Cc: Kees Cook , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] module: Prepare to convert all module_param_call() prototypes Date: Tue, 17 Oct 2017 19:04:41 -0700 Message-Id: <1508292283-140003-2-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508292283-140003-1-git-send-email-keescook@chromium.org> References: <1508292283-140003-1-git-send-email-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After actually converting all module_param_call() function prototypes, we no longer need to do a tricky sizeof(func(thing)) type-check. Remove it. Signed-off-by: Kees Cook --- include/linux/moduleparam.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 1ee7b30dafec..037a90a522a5 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -228,18 +228,10 @@ struct kparam_array /* Obsolete - use module_param_cb() */ #define module_param_call(name, set, get, arg, perm) \ - static const struct kernel_param_ops __param_ops_##name = \ + static const struct kernel_param_ops __param_ops_##name = \ { .flags = 0, (void *)set, (void *)get }; \ __module_param_call(MODULE_PARAM_PREFIX, \ - name, &__param_ops_##name, arg, \ - (perm) + sizeof(__check_old_set_param(set))*0, -1, 0) - -/* We don't get oldget: it's often a new-style param_get_uint, etc. */ -static inline int -__check_old_set_param(int (*oldset)(const char *, struct kernel_param *)) -{ - return 0; -} + name, &__param_ops_##name, arg, perm, -1, 0) #ifdef CONFIG_SYSFS extern void kernel_param_lock(struct module *mod); -- 2.7.4