From patchwork Thu Mar 26 07:59:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Leblond X-Patchwork-Id: 25139 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id CA91DDDD1B for ; Thu, 26 Mar 2009 19:41:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757699AbZCZIkR (ORCPT ); Thu, 26 Mar 2009 04:40:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757677AbZCZIkQ (ORCPT ); Thu, 26 Mar 2009 04:40:16 -0400 Received: from bayen.regit.org ([81.57.69.189]:35088 "EHLO ice-age" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757598AbZCZIkN (ORCPT ); Thu, 26 Mar 2009 04:40:13 -0400 X-Greylist: delayed 2396 seconds by postgrey-1.27 at vger.kernel.org; Thu, 26 Mar 2009 04:40:12 EDT Received: from eric by ice-age with local (Exim 4.69) (envelope-from ) id 1LmkVI-0002ND-N8; Thu, 26 Mar 2009 08:59:56 +0100 From: Eric Leblond To: davem@davemloft.net, kaber@trash.net, sfr@canb.auug.org.au Cc: linux-next@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Eric Leblond Subject: [PATCH 2/3] netfilter: fix warning in ebt_ulog init function. Date: Thu, 26 Mar 2009 08:59:55 +0100 Message-Id: <1238054396-9088-2-git-send-email-eric@inl.fr> X-Mailer: git-send-email 1.6.1 In-Reply-To: <1238053819.13879.4.camel@ice-age> References: <1238053819.13879.4.camel@ice-age> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ebt_ulog module does not follow the fixed convention about function return. Loading the module is triggering the following message: sys_init_module: 'ebt_ulog'->init suspiciously returned 1, it should follow 0/-E convention sys_init_module: loading module anyway... Pid: 2334, comm: modprobe Not tainted 2.6.29-rc5edenwall0-00883-g199e57b #146 Call Trace: [] ? printk+0xf/0x16 [] sys_init_module+0x107/0x186 [] syscall_call+0x7/0xb The following patch fixes the return treatment in ebt_ulog_init() function. Signed-off-by: Eric Leblond --- net/bridge/netfilter/ebt_ulog.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index 80c78c5..ac6fa43 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c @@ -287,13 +287,13 @@ static struct nf_logger ebt_ulog_logger __read_mostly = { static int __init ebt_ulog_init(void) { - bool ret = true; + int ret; int i; if (nlbufsiz >= 128*1024) { printk(KERN_NOTICE "ebt_ulog: Netlink buffer has to be <= 128kB," " please try a smaller nlbufsiz parameter.\n"); - return false; + return -EINVAL; } /* initialize ulog_buffers */ @@ -308,12 +308,12 @@ static int __init ebt_ulog_init(void) if (!ebtulognl) { printk(KERN_WARNING KBUILD_MODNAME ": out of memory trying to " "call netlink_kernel_create\n"); - ret = false; - } else if (xt_register_target(&ebt_ulog_tg_reg) != 0) { + ret = -ENOMEM; + } else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0) { netlink_kernel_release(ebtulognl); } - if (ret) + if (ret == 0) nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger); return ret;