From patchwork Tue Sep 25 04:29:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 186691 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3932D2C0083 for ; Tue, 25 Sep 2012 14:29:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751768Ab2IYE3E (ORCPT ); Tue, 25 Sep 2012 00:29:04 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:38775 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750854Ab2IYE3D (ORCPT ); Tue, 25 Sep 2012 00:29:03 -0400 Received: by qadc26 with SMTP id c26so1471123qad.19 for ; Mon, 24 Sep 2012 21:29:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=vuXaT2KNTBS/nWQLwRDGXG8EBPJ8re+2w3VLS/hpA/4=; b=fDjunA5R3nKKqoFzO3mSZG/SdYHuopOci3PWhlqYBKTrFEWx6M8XKclh/1FLFuLQXW 7ef7ezy9Unnyb4Xn5GWxjnNTH1Snv1TeTdougzQj62iYtZTJ+Y6Z+eIvYSOxlPYt1LD8 qkRJNvQ2/VYsKFqeOsNSR/F7QppOCwszt8ixF9A/rpqLQS5voh0AX38P4eDLedBqGK17 8dmj7C/HAhmlzYxGN0LZkOlFy9gNhJscpqkjO2uf9O4lqH2lHWwAx8ker0kwbrBFGphf u9klij2VuBR4Kc2c2bb4bbMFKw1FvGbToZXQr8Mh/Z5+bVVilOgzZo2/ql6cf6lkOBGG 1Ykw== MIME-Version: 1.0 Received: by 10.224.178.4 with SMTP id bk4mr37241461qab.38.1348547341858; Mon, 24 Sep 2012 21:29:01 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Mon, 24 Sep 2012 21:29:01 -0700 (PDT) Date: Tue, 25 Sep 2012 12:29:01 +0800 Message-ID: Subject: [PATCH] l2tp: fix return value check From: Wei Yongjun To: davem@davemloft.net Cc: yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun In case of error, the function genlmsg_put() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun --- net/l2tp/l2tp_netlink.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index d71cd92..6f93635 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -80,8 +80,8 @@ static int l2tp_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info) hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &l2tp_nl_family, 0, L2TP_CMD_NOOP); - if (IS_ERR(hdr)) { - ret = PTR_ERR(hdr); + if (!hdr) { + ret = -EMSGSIZE; goto err_out; } @@ -250,8 +250,8 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 pid, u32 seq, int flags, hdr = genlmsg_put(skb, pid, seq, &l2tp_nl_family, flags, L2TP_CMD_TUNNEL_GET); - if (IS_ERR(hdr)) - return PTR_ERR(hdr); + if (!hdr) + return -EMSGSIZE; if (nla_put_u8(skb, L2TP_ATTR_PROTO_VERSION, tunnel->version) || nla_put_u32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id) || @@ -617,8 +617,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 pid, u32 seq, int flags sk = tunnel->sock; hdr = genlmsg_put(skb, pid, seq, &l2tp_nl_family, flags, L2TP_CMD_SESSION_GET); - if (IS_ERR(hdr)) - return PTR_ERR(hdr); + if (!hdr) + return -EMSGSIZE; if (nla_put_u32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id) || nla_put_u32(skb, L2TP_ATTR_SESSION_ID, session->session_id) ||