From patchwork Wed Dec 28 11:26:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Ricardo Leitner X-Patchwork-Id: 709212 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 3tpVnh5QZdz9t0t for ; Wed, 28 Dec 2016 22:27:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sl3Uz2Hw"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751426AbcL1L1T (ORCPT ); Wed, 28 Dec 2016 06:27:19 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:35535 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751328AbcL1L1S (ORCPT ); Wed, 28 Dec 2016 06:27:18 -0500 Received: by mail-qk0-f195.google.com with SMTP id u25so31290985qki.2; Wed, 28 Dec 2016 03:27:17 -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:in-reply-to:references; bh=7KMuWJ1GM21PmuVmeGOubv9LOwTZgFVJ1phVK91edg8=; b=sl3Uz2HwzXwL7vH36eoDui5nBbareO9MwXPo6RmeZCakbva5FcNhxelC3gR4LpluH3 pcsQnRukbJjyOlPY8q0PtBRmISyoNbm2pq8mnWtjsu5srsL6MW45cZP8S0heaR7TqQLo Wn6bXl2xqT6N4HgR4KzYvlp5MZ0g4B/G9IDwoz44c+qFxk02RZ73Aqy20qNZqbKN049a P2lT854IXA2hu+sYXuPU/ta7xnnFOE2FkBacQfwVnDnabT3PGwfRtGJi8PeVaENXZiDQ kZuhzbAiczVQlWbqNSWTAkNoB5QHzJlDxnCiPQcMSwUmpQzbAy5x3056+2+3g85l3mgZ CtkA== 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:in-reply-to :references; bh=7KMuWJ1GM21PmuVmeGOubv9LOwTZgFVJ1phVK91edg8=; b=Dqp+GxEbiFunp9YRnvMB3vNMXgg8hfP+4m/FrmC2RthkLJMXT3BziTfsaVy5PVUIJA L2F/DIfLyFMUuYJpSRQsc8xPgjHW7hFKHm/IoLkfdmwKnTa4jiAtcPQasxVVt6o7hKOL 5VhmR4780h2N5IejCitBBz17Qkh/yfh2IjRHJMvdSk2lHxrfcDuXx521OtLWitQbHMAF JTfo/gg69150+IzDwfHosp7OGEeIObTiKcGBWfOzkUWcUguqsqOqknkq5WLS3J/PFPO2 FqjSarYKV79CTzbwmU9TvB407o1T/R+yguEDdGTcfZ2tfCAi/XkZvinELqsm3mQBY39K TzhQ== X-Gm-Message-State: AIkVDXKmqJiEJdOveb4bNJ6k4wpVpK2XIXVbYZyjluCG1NMZMCTAg5A1+MbBk170J9Dftw== X-Received: by 10.55.210.131 with SMTP id f125mr37433364qkj.98.1482924437208; Wed, 28 Dec 2016 03:27:17 -0800 (PST) Received: from localhost.localdomain.com ([2804:7f4:3381:1ed0::1]) by smtp.gmail.com with ESMTPSA id q53sm30590477qtq.0.2016.12.28.03.27.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Dec 2016 03:27:16 -0800 (PST) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Vlad Yasevich , Neil Horman Subject: [PATCH RESEND net-next 2/5] sctp: reduce indent level in sctp_sf_shut_8_4_5 Date: Wed, 28 Dec 2016 09:26:32 -0200 Message-Id: <516c622c83445125697aa64f6c28c6538a09a37d.1482924092.git.marcelo.leitner@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Marcelo Ricardo Leitner --- net/sctp/sm_statefuns.c | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 32587b1f84e729221965e270607fea7ef93a7430..a95915ef9dbabad30f6171f77b26feab61752f36 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -3501,45 +3501,43 @@ static sctp_disposition_t sctp_sf_shut_8_4_5(struct net *net, struct sctp_chunk *shut; packet = sctp_ootb_pkt_new(net, asoc, chunk); + if (!packet) + return SCTP_DISPOSITION_NOMEM; - if (packet) { - /* Make an SHUTDOWN_COMPLETE. - * The T bit will be set if the asoc is NULL. - */ - shut = sctp_make_shutdown_complete(asoc, chunk); - if (!shut) { - sctp_ootb_pkt_free(packet); - return SCTP_DISPOSITION_NOMEM; - } - - /* Reflect vtag if T-Bit is set */ - if (sctp_test_T_bit(shut)) - packet->vtag = ntohl(chunk->sctp_hdr->vtag); + /* Make an SHUTDOWN_COMPLETE. + * The T bit will be set if the asoc is NULL. + */ + shut = sctp_make_shutdown_complete(asoc, chunk); + if (!shut) { + sctp_ootb_pkt_free(packet); + return SCTP_DISPOSITION_NOMEM; + } - /* Set the skb to the belonging sock for accounting. */ - shut->skb->sk = ep->base.sk; + /* Reflect vtag if T-Bit is set */ + if (sctp_test_T_bit(shut)) + packet->vtag = ntohl(chunk->sctp_hdr->vtag); - sctp_packet_append_chunk(packet, shut); + /* Set the skb to the belonging sock for accounting. */ + shut->skb->sk = ep->base.sk; - sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT, - SCTP_PACKET(packet)); + sctp_packet_append_chunk(packet, shut); - SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS); + sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT, + SCTP_PACKET(packet)); - /* If the chunk length is invalid, we don't want to process - * the reset of the packet. - */ - if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t))) - return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands); + SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS); - /* We need to discard the rest of the packet to prevent - * potential bomming attacks from additional bundled chunks. - * This is documented in SCTP Threats ID. - */ + /* If the chunk length is invalid, we don't want to process + * the reset of the packet. + */ + if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t))) return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands); - } - return SCTP_DISPOSITION_NOMEM; + /* We need to discard the rest of the packet to prevent + * potential bomming attacks from additional bundled chunks. + * This is documented in SCTP Threats ID. + */ + return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands); } /*