Messages in this thread Patch in this message | | | Date | Sun, 13 Sep 2015 00:57:04 +0200 | From | Willy Tarreau <> | Subject | [PATCH 2.6.32 58/62] dccp: fix auto-loading of dccp(_probe) |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk> Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit 1386be55e32a3c5d8ef4a2b243c530a7b664c02c)
Signed-off-by: Willy Tarreau <w@1wt.eu> --- 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
| |