From patchwork Wed Dec 18 02:24:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerrit Renker X-Patchwork-Id: 302615 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 4E7B82C00A7 for ; Wed, 18 Dec 2013 13:24:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751433Ab3LRCYo (ORCPT ); Tue, 17 Dec 2013 21:24:44 -0500 Received: from spey.erg.abdn.ac.uk ([139.133.204.173]:58542 "EHLO spey.erg.abdn.ac.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750875Ab3LRCYm (ORCPT ); Tue, 17 Dec 2013 21:24:42 -0500 Received: from liptov.cs.ualberta.ca (nat-fw.cs.ualberta.ca [129.128.184.5]) by spey.erg.abdn.ac.uk (Postfix) with ESMTPSA id 4AA8F2B432B; Wed, 18 Dec 2013 02:24:38 +0000 (GMT) Date: Tue, 17 Dec 2013 19:24:33 -0700 From: Gerrit Renker To: Wang Weidong Cc: David Miller , , Subject: [PATCH 1/1][net-next] dccp: catch failed request_module call in dccp_probe init (was: [PATCH net-next] dccp: add check request_moduls in setup_jprobe) Message-ID: <20131217192433.168b39ef@liptov.cs.ualberta.ca> In-Reply-To: <52B043D9.9090808@huawei.com> References: <52B043D9.9090808@huawei.com> Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Wang, thank you for the patch, please find refactored version below, changes are (a) if request_module fails, return its error code instead of the previous ret, (b) refactor code -- setup_jprobe becomes superfluous. Please add your signed off if ok, since it is essentially your patch. >>>>>>>>>>>>>>>>>>>>>>> Wang's patch revised <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< dccp: catch failed request_module call in dccp_probe init Check the return value of request_module during dccp_probe initialisation, bail out if that call fails. Signed-off-by: Gerrit Renker Signed-off-by: Wang Weidong --- net/dccp/probe.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -152,17 +152,6 @@ static const struct file_operations dccp .llseek = noop_llseek, }; -static __init int setup_jprobe(void) -{ - int ret = register_jprobe(&dccp_send_probe); - - if (ret) { - request_module("dccp"); - ret = register_jprobe(&dccp_send_probe); - } - return ret; -} - static __init int dccpprobe_init(void) { int ret = -ENOMEM; @@ -174,7 +163,13 @@ static __init int dccpprobe_init(void) if (!proc_create(procname, S_IRUSR, init_net.proc_net, &dccpprobe_fops)) goto err0; - ret = setup_jprobe(); + ret = register_jprobe(&dccp_send_probe); + if (ret) { + ret = request_module("dccp"); + if (!ret) + ret = register_jprobe(&dccp_send_probe); + } + if (ret) goto err1;