From b72b2658fe0a6148439b4409ace51ec8e0d1a54f Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 28 Jan 2008 20:52:12 -0800 Subject: [PATCH] --- yaml --- r: 81857 b: refs/heads/master c: 8cf8e5a67fb07f583aac94482ba51a7930dab493 h: refs/heads/master i: 81855: 30b074342e7fabe0e398e892ead75b366c5ab034 v: v3 --- [refs] | 2 +- trunk/net/ipv4/inet_diag.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4e221ca0db6c..e1bb1711ebbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 406a1d868001423c85a3165288e566e65f424fe6 +refs/heads/master: 8cf8e5a67fb07f583aac94482ba51a7930dab493 diff --git a/trunk/net/ipv4/inet_diag.c b/trunk/net/ipv4/inet_diag.c index 605ed2cd7972..4cfb15c461f1 100644 --- a/trunk/net/ipv4/inet_diag.c +++ b/trunk/net/ipv4/inet_diag.c @@ -259,8 +259,10 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, const struct inet_diag_handler *handler; handler = inet_diag_lock_handler(nlh->nlmsg_type); - if (!handler) - return -ENOENT; + if (IS_ERR(handler)) { + err = PTR_ERR(handler); + goto unlock; + } hashinfo = handler->idiag_hashinfo; err = -EINVAL; @@ -708,8 +710,8 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) struct inet_hashinfo *hashinfo; handler = inet_diag_lock_handler(cb->nlh->nlmsg_type); - if (!handler) - goto no_handler; + if (IS_ERR(handler)) + goto unlock; hashinfo = handler->idiag_hashinfo; @@ -838,7 +840,6 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) cb->args[2] = num; unlock: inet_diag_unlock_handler(handler); -no_handler: return skb->len; }