From patchwork Mon Apr 10 13:11:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 749018 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 3w1rDJ0P4kz9sNd for ; Mon, 10 Apr 2017 23:11:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P4Gd5lzo"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753415AbdDJNLS (ORCPT ); Mon, 10 Apr 2017 09:11:18 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:34136 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753310AbdDJNLN (ORCPT ); Mon, 10 Apr 2017 09:11:13 -0400 Received: by mail-pg0-f67.google.com with SMTP id o123so25691340pga.1 for ; Mon, 10 Apr 2017 06:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=m52lTQA8A6zzyIcR9plFJqUB4zr+nR6id7llLMP/mak=; b=P4Gd5lzoJUC8wORhuuNpItF5hSovxZw/I+jUvPYA3x4nOk3aKqxPDb3Vr6dZI3NSuA 9jUo/stoRVxJhSEAtjuqYflBmofjerRjPLzNWk4OsLka3fvgYCzzi0SE07+KxTnDVoFX ATjhSc8VJjglUfcjbDPqmlgDSspHcg62PyU5AMBL18YikbB9rMgEml0BXOdz7PpHKao4 3B3RH2eiRL0D8dwCQ/ZHwB00xcpRMzoI5RSGnAytV4CRp3VBrPpXqke4hLc48n7BQeIt Eo/ZpvBzqEtv84mjxIzrNAgpGTcRZhZMEX8nGZefKn/zEV86ClUSq0Y10HNFHW4AEF39 Fq5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=m52lTQA8A6zzyIcR9plFJqUB4zr+nR6id7llLMP/mak=; b=BvfxUTsGuJL6VW7owpuVSEzRxny/UQWZDJONgaaesUYK9kCN1Tg0vmKz0iya3iL5d7 jIsgQ2Iyl+V9xhIt8eHnwRo1mL7gSP54ndSTJF6FoaxQT1M9dPc5REhC19b//iJOvVCf RzmZaiBOPGnZlTvYf+UE1etG/p/NcTIK5y/j/T8O7FZCKq8/E3ni92TeAHvTcsz8VjEB 6c1A0A5N6V5dnwIFWOZCot6wQuiWeZNIlUGcZKyrnZIVdfayfSZQ7lB94ii04Q89XVrn qK2DIJ1kVFirbrPkUk5jCGAcnMwNkkFjLYuMOW5zIOUYKo5QWxC1YB9U0DmpFUc/0TF1 UXXA== X-Gm-Message-State: AFeK/H2Onn/gRjOz9wTBgMiNSOz+Kravpd6pTxD2oyolXD6hvehdUvOPNzruGUkpWAd8cA== X-Received: by 10.98.67.193 with SMTP id l62mr53450103pfi.148.1491829872575; Mon, 10 Apr 2017 06:11:12 -0700 (PDT) Received: from localhost.localdomain.localdomain (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id b128sm24930198pgc.16.2017.04.10.06.11.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 06:11:11 -0700 (PDT) From: Wei Yongjun To: Jiri Pirko , Arkadi Sharshevsky , "David S. Miller" Cc: Wei Yongjun , netdev@vger.kernel.org Subject: [PATCH net-next] devlink: fix return value check in devlink_dpipe_header_put() Date: Mon, 10 Apr 2017 13:11:06 +0000 Message-Id: <20170410131106.27683-1-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun Fix the retrn value check which testing the wrong variable in devlink_dpipe_header_put(). Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)") Signed-off-by: Wei Yongjun Acked-by: Jiri Pirko --- net/core/devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 24b7660..0afac58 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -2031,7 +2031,7 @@ static int devlink_dpipe_header_put(struct sk_buff *skb, int err; header_attr = nla_nest_start(skb, DEVLINK_ATTR_DPIPE_HEADER); - if (!header) + if (!header_attr) return -EMSGSIZE; if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_HEADER_NAME, header->name) ||