From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755361AbbILXM3 (ORCPT ); Sat, 12 Sep 2015 19:12:29 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:9188 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755025AbbILXME (ORCPT ); Sat, 12 Sep 2015 19:12:04 -0400 Message-Id: <20150912225609.161382637@1wt.eu> User-Agent: quilt/0.63-1 Date: Sun, 13 Sep 2015 00:57:06 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gerrit Renker , Wang Weidong , "David S. Miller" , Willy Tarreau Subject: [PATCH 2.6.32 60/62] dccp: catch failed request_module call in dccp_probe init MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 In-Reply-To: <08d3b586eb2e764308c3de9ee398a17c@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Wang Weidong 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 Signed-off-by: David S. Miller (cherry picked from commit 965cdea825693c821d200e38fac9402cde6dce6a) Signed-off-by: Willy Tarreau --- net/dccp/probe.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 89f25cb..1610810 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -151,17 +151,6 @@ static const struct file_operations dccpprobe_fops = { .read = dccpprobe_read, }; -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; @@ -175,7 +164,13 @@ static __init int dccpprobe_init(void) if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &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; -- 1.7.12.2.21.g234cd45.dirty