From 879c9c9ceef3c0caa15e67bf2855a886b19a1cfe Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Wed, 22 Nov 2006 20:26:11 -0800 Subject: [PATCH] --- yaml --- r: 41096 b: refs/heads/master c: ac16ca6412d9feb5b2f8fc76a4ed938b5d107f94 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/probe.c | 2 ++ trunk/net/ipv4/tcp_probe.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1eccef9b48bb..36a071688378 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 753eab76a3337863a0d86ce045fa4eb6c3cbeef9 +refs/heads/master: ac16ca6412d9feb5b2f8fc76a4ed938b5d107f94 diff --git a/trunk/net/dccp/probe.c b/trunk/net/dccp/probe.c index 146496fce2e2..fded1493c1dc 100644 --- a/trunk/net/dccp/probe.c +++ b/trunk/net/dccp/probe.c @@ -160,6 +160,8 @@ static __init int dccpprobe_init(void) init_waitqueue_head(&dccpw.wait); spin_lock_init(&dccpw.lock); dccpw.fifo = kfifo_alloc(bufsize, GFP_KERNEL, &dccpw.lock); + if (IS_ERR(dccpw.fifo)) + return PTR_ERR(dccpw.fifo); if (!proc_net_fops_create(procname, S_IRUSR, &dccpprobe_fops)) goto err0; diff --git a/trunk/net/ipv4/tcp_probe.c b/trunk/net/ipv4/tcp_probe.c index 4be336f17883..f230eeecf092 100644 --- a/trunk/net/ipv4/tcp_probe.c +++ b/trunk/net/ipv4/tcp_probe.c @@ -156,6 +156,8 @@ static __init int tcpprobe_init(void) init_waitqueue_head(&tcpw.wait); spin_lock_init(&tcpw.lock); tcpw.fifo = kfifo_alloc(bufsize, GFP_KERNEL, &tcpw.lock); + if (IS_ERR(tcpw.fifo)) + return PTR_ERR(tcpw.fifo); if (!proc_net_fops_create(procname, S_IRUSR, &tcpprobe_fops)) goto err0;