From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932223AbbILXPm (ORCPT ); Sat, 12 Sep 2015 19:15:42 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:9379 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755523AbbILXNW (ORCPT ); Sat, 12 Sep 2015 19:13:22 -0400 Message-Id: <20150912225609.076377284@1wt.eu> User-Agent: quilt/0.63-1 Date: Sun, 13 Sep 2015 00:57:04 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gerrit Renker , Neil Horman , "David S. Miller" , Willy Tarreau Subject: [PATCH 2.6.32 58/62] dccp: fix auto-loading of dccp(_probe) 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: Gerrit Renker This fixes commit (38ff3e6bb987ec583268da8eb22628293095d43b) ("dccp_probe: Fix module load dependencies between dccp and dccp_probe", from 15 Jan). It fixes the construction of the first argument of try_then_request_module(), where only valid return codes from the first argument should be returned. What we do now is assign the result of register_jprobe() to ret, without the side effect of the comparison. Acked-by: Gerrit Renker Signed-off-by: Neil Horman Signed-off-by: David S. Miller (cherry picked from commit 1386be55e32a3c5d8ef4a2b243c530a7b664c02c) Signed-off-by: Willy Tarreau --- net/dccp/probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 4875998..3ba43b8 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -164,8 +164,8 @@ static __init int dccpprobe_init(void) if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops)) goto err0; - ret = try_then_request_module((register_jprobe(&dccp_send_probe) == 0), - "dccp"); + try_then_request_module((ret = register_jprobe(&dccp_send_probe)) == 0, + "dccp"); if (ret) goto err1; -- 1.7.12.2.21.g234cd45.dirty