From patchwork Wed Jun 20 15:47:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Ricardo Leitner X-Patchwork-Id: 932311 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AxjE+t5P"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 419q456HB7z9s3C for ; Thu, 21 Jun 2018 01:48:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932082AbeFTPsT (ORCPT ); Wed, 20 Jun 2018 11:48:19 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:46603 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754289AbeFTPsK (ORCPT ); Wed, 20 Jun 2018 11:48:10 -0400 Received: by mail-qt0-f195.google.com with SMTP id h5-v6so2206qtm.13; Wed, 20 Jun 2018 08:48:09 -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; bh=nRHAVS8dbk5vIM6HqfwD9/CXvKNV5FL9gD9qM6IVOMU=; b=AxjE+t5PvwlzGCZoS8WxKnluYh29v+f1khQyIaIF/WyJ8Cjm6zNxr2o/O6ZLx8DUpf tqMXwcC3XDZ1UY7fotyCN5GZWOAo0tK2vhoMDVudNUbwNdGK+8dcdbBeOmXxk8xT/GDd OFupsIGXUX8uBwThrsUUti4dPY1VyQkCQ3zEkqQFy2NGrlfFLF43LJRWdr608z3VzPCF +zQFrMfA1BLdshb0XLMscOPVYcOjOk5gwOeE9ZD8mqC1sgHAs0jn7P0MKfz6QzVoQzR/ dcOSc30Ck+PmMSl8mcpcTb/BHbqUrC6rxtru23QJuA6fqFWGeH4VigLY19taOzrZORjo wVIQ== 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=nRHAVS8dbk5vIM6HqfwD9/CXvKNV5FL9gD9qM6IVOMU=; b=m+9bHV22I1f5K1/oDCIK0l9SnDRG8fsbj+hJReWLh/e5E1KCdj/0sEwKr97qvlcu4E A3YrdXQ4kHmKLTuuDFpH6KIhsrQV5pOG4xqfRW2HHya9ndYz2iREqV7pxgTG1gwcW7Oo fK+YidICD0w+HKYRJnN2ntrEpM8lIMCM6sTugR2c+bBXzHUo++ms/Ng96hUak2spAYAK W4tLYoXwu8QrLqVTJqdE9xTmw5kLRr4Q+7vmgSObN3fgWTwtBowQbV/kUzkWxqf0GA2A Io7/d3fjNHWW8PvxtFoQvhDghZ6n1f7nKmtxlLEX7XbHNBYbemW0CV8MEjyIOHawSGuj f91Q== X-Gm-Message-State: APt69E1f/9b5o0E3hsy1+jsWsif05nfiMwxWLJnGPCpu/8FsaCjxttRR POGYAP3vdVXudFVOCYR9GUSBSw== X-Google-Smtp-Source: ADUXVKKmtK55+sxcn2JH1KHjq0XjGcVBa07wFeWKYwsN4gCoGa/BLWIUz5nSj8PmlJQtezNHUAoOew== X-Received: by 2002:ac8:683:: with SMTP id f3-v6mr20028792qth.104.1529509689232; Wed, 20 Jun 2018 08:48:09 -0700 (PDT) Received: from localhost.localdomain ([2001:1284:f013:3c27:789c:1262:2969:fbfc]) by smtp.gmail.com with ESMTPSA id v56-v6sm2229483qtv.50.2018.06.20.08.48.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 08:48:08 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id 0FEB0180D11; Wed, 20 Jun 2018 12:48:06 -0300 (-03) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Neil Horman , Vlad Yasevich Subject: [PATCH net] sctp: fix erroneous inc of snmp SctpFragUsrMsgs Date: Wed, 20 Jun 2018 12:47:52 -0300 Message-Id: X-Mailer: git-send-email 2.14.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently it is incrementing SctpFragUsrMsgs when the user message size is of the exactly same size as the maximum fragment size, which is wrong. The fix is to increment it only when user message is bigger than the maximum fragment size. Fixes: bfd2e4b8734d ("sctp: refactor sctp_datamsg_from_user") Signed-off-by: Marcelo Ricardo Leitner Acked-by: Neil Horman --- net/sctp/chunk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c index 79daa98208c391c780440144d69bc7be875c3476..bfb9f812e2ef9fa605b08dc1f534781573c3abf8 100644 --- a/net/sctp/chunk.c +++ b/net/sctp/chunk.c @@ -237,7 +237,9 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, /* Account for a different sized first fragment */ if (msg_len >= first_len) { msg->can_delay = 0; - SCTP_INC_STATS(sock_net(asoc->base.sk), SCTP_MIB_FRAGUSRMSGS); + if (msg_len > first_len) + SCTP_INC_STATS(sock_net(asoc->base.sk), + SCTP_MIB_FRAGUSRMSGS); } else { /* Which may be the only one... */ first_len = msg_len;