From patchwork Mon Feb 12 10:29:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 871972 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZtnDeRYo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zg23Q0GN3z9t2l for ; Mon, 12 Feb 2018 21:29:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933679AbeBLK3f (ORCPT ); Mon, 12 Feb 2018 05:29:35 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:34093 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933904AbeBLK3d (ORCPT ); Mon, 12 Feb 2018 05:29:33 -0500 Received: by mail-io0-f194.google.com with SMTP id e7so2501237ioj.1; Mon, 12 Feb 2018 02:29:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=8hHUDD3lp1tNk43Ejjp5xhyhPOweW6vGdxak27EnwOw=; b=ZtnDeRYow3gE6PWrYLRfWI5dH+cSsRZC6kT9/4Wy65Kl84qJn3Ilek6nfWYa8KNt0p nM/82ZZZVOYailheS6wkSWC9YOOoeI3a+N5Zevy4p9KcxXzqt5BRkswCz5PLRZdBrnRa XSQ1aWoYuIecq4pHgSi7SM5mB+ZtQWqEepp/JHr9g9wi5sTfVQ7g/Xf05IBjqlLP5qG7 +P4PtouSzjuKhErt9HDtW4DLgt4/FWNHx+dGJczC7iLGSTrqRcVep58UzgGQvOXloY3o FyIl2QKST7CuZ2LWiLhdIXCFCrkQ0WHl0a8sFfcpa9NCzE1DAhfwQkGeeLfDYRjyK6Uc mNDw== 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; bh=8hHUDD3lp1tNk43Ejjp5xhyhPOweW6vGdxak27EnwOw=; b=U48Q6gnjFT5az/dDZoQrvQ4Fwfs7XbCkGDAl8ihGv4cJ4UyxmjtZP9dqMcHy8/FXd9 k6Hhm0CSCvU6xoPlny2X1NPZWG0V3nML/fKtJAlJZiKBBOfKuPmy5sRPhkm9KzAyYz3p /x41+7Gr5saBQ9cEtysqoPUi36tQ2bVRtOgBbIE5G01h229jZruswPXymvr4xmg4GXGq sgIYkOx0v3alwWfL42EyKbEY6OwKKJEsLVTdfEo0Y2JK29FDJKcnRGspZT2vI++gQNgf 11BCmX9VkhOvwyudSKksjYpZfkzDEMEKRyGwnZ9CQjsWlVRAf/JdLT5ly8lgdAiF6/rd Zbug== X-Gm-Message-State: APf1xPCQ5i2CVREZ6g8jtOAYXFbal0YTWAil0JEEppzDSogr0QUX7EXw oAYrzjQAUG2HRi504Jay3z2KLPIF X-Google-Smtp-Source: AH8x224KWoJj6AQzlLzE0x5/eLiK6Ezc2bkOuYYwvB9sZ9zCgXqJgxgWVcyCpl4aFhxYS7kfKG98iA== X-Received: by 10.107.53.83 with SMTP id c80mr1475171ioa.90.1518431372586; Mon, 12 Feb 2018 02:29:32 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id s70sm7370058itb.0.2018.02.12.02.29.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 02:29:32 -0800 (PST) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net] sctp: do not pr_err for the duplicated node in transport rhlist Date: Mon, 12 Feb 2018 18:29:06 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The pr_err in sctp_hash_transport was supposed to report a sctp bug for using rhashtable/rhlist. The err '-EEXIST' introduced in Commit cd2b70875058 ("sctp: check duplicate node before inserting a new transport") doesn't belong to that case. So just return -EEXIST back without pr_err any kmsg. Fixes: cd2b70875058 ("sctp: check duplicate node before inserting a new transport") Reported-by: Wei Chen Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Acked-by: Neil Horman --- net/sctp/input.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/sctp/input.c b/net/sctp/input.c index 141c9c4..0247cc4 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -897,15 +897,12 @@ int sctp_hash_transport(struct sctp_transport *t) rhl_for_each_entry_rcu(transport, tmp, list, node) if (transport->asoc->ep == t->asoc->ep) { rcu_read_unlock(); - err = -EEXIST; - goto out; + return -EEXIST; } rcu_read_unlock(); err = rhltable_insert_key(&sctp_transport_hashtable, &arg, &t->node, sctp_hash_params); - -out: if (err) pr_err_once("insert transport fail, errno %d\n", err);