From patchwork Mon Mar 18 12:05:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057842 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="rpMY0DBp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFK22zFBz9sBF for ; Mon, 18 Mar 2019 23:06:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727357AbfCRMG3 (ORCPT ); Mon, 18 Mar 2019 08:06:29 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:43880 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMG3 (ORCPT ); Mon, 18 Mar 2019 08:06:29 -0400 Received: by mail-pg1-f193.google.com with SMTP id l11so11213173pgq.10; Mon, 18 Mar 2019 05:06:28 -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:in-reply-to:references :in-reply-to:references; bh=QQrOKhaYPnYbxOaGRzAFa/l0XZczKAR2cIzsEvxvaaA=; b=rpMY0DBpMrqXbp6FXkE9/wr2mXkqM+8ra50qJypj3xqCwEd9KDzcCfJHHTpqYkeaMr 2nGsuGFRBP6dY5tUUYIi0hIIvxnLVDrM+CkxYro761uh9La6dPr46RCu6OA0rUwb8Lcg 8D4M+liCvL/lfTH29d0nQ8XByUG7OnlOQR8zbHVzUJ/+XHZII1RRExEYtK8B4d66NzWr nkR9R8v221xcg4tjaXoeEz3CtfMSgUGGPgB5vQ/obRuvO/o3o5W3wPhKk4Hbdo43uVUE kZBAy253aGcr+PMoU8OE2FC56W/evQ2EUd+drDiNcOPaQnlC1a5143XB1UOSZFxsUVcT QK4Q== 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:in-reply-to:references; bh=QQrOKhaYPnYbxOaGRzAFa/l0XZczKAR2cIzsEvxvaaA=; b=Ii+aX9agHh9kXGd5GtvFqZn/M9GAKx61Yer939TR7gcFWXAsPRLx7tAxd7WWdf+ScT cdvAAZib1CPGYMQRgHXtQJnro5uvQpPVnpHEbhz8sT2mlf/4HBv5yQFaAg3PfFHc2h1h R3tDrJ99bmyrRcDoVWk317OuJMgd8+XhZ4VGFV4iRrLV0JgC5+DkgLVAGNASiXHSedOy Q+5C7Qvs4Mnou70W30KWWj1q7wL9QQ6AO3Hdqpipths7r5+iPBs+vUWcWKpLpNzHolLk hR9w4fBURO+n/HQfIxlzFO4638oEKEo0gWc3kOkoUufXInhJUTQm7sswahQ1maRSnEbs pv7Q== X-Gm-Message-State: APjAAAVr05O31wpYW8dLFr3cMS5y6AQ3aGJCcYO9W41JxuGd0thJzrq/ EQFo3xa3r0ZVYJ/F7pliK4lntBS/RpU= X-Google-Smtp-Source: APXvYqzy3BtVAgdFHB14ZvokvqBWDpypEikNx9LndhIJ72r1cl4taKfEbXWmw6lrT6HFvindRJC/9Q== X-Received: by 2002:a63:214d:: with SMTP id s13mr901802pgm.349.1552910788114; Mon, 18 Mar 2019 05:06:28 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id a66sm21314899pfj.153.2019.03.18.05.06.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:06:27 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 01/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt Date: Mon, 18 Mar 2019 20:05:59 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Marcelo Ricardo Leitner Currently if the user pass an invalid asoc_id to SCTP_DEFAULT_SEND_PARAM on a TCP-style socket, it will silently ignore the new parameters. That's because after not finding an asoc, it is checking asoc_id against the known values of CURRENT/FUTURE/ALL values and that fails to match. IOW, if the user supplies an invalid asoc id or not, it should either match the current asoc or the socket itself so that it will inherit these later. Fixes it by forcing asoc_id to SCTP_FUTURE_ASSOC in case it is a TCP-style socket without an asoc, so that the values get set on the socket. Fixes: 707e45b3dc5a ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_SEND_PARAM sockopt") Signed-off-by: Marcelo Ricardo Leitner --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 65b5386..d0e5c62 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3024,6 +3024,9 @@ static int sctp_setsockopt_default_send_param(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + info.sinfo_assoc_id = SCTP_FUTURE_ASSOC; + if (info.sinfo_assoc_id == SCTP_FUTURE_ASSOC || info.sinfo_assoc_id == SCTP_ALL_ASSOC) { sp->default_stream = info.sinfo_stream; From patchwork Mon Mar 18 12:06:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057843 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="B9fKuhcr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFKD4y11z9s3q for ; Mon, 18 Mar 2019 23:06:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727433AbfCRMGi (ORCPT ); Mon, 18 Mar 2019 08:06:38 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:37806 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMGi (ORCPT ); Mon, 18 Mar 2019 08:06:38 -0400 Received: by mail-pg1-f195.google.com with SMTP id q206so11230925pgq.4; Mon, 18 Mar 2019 05:06:37 -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:in-reply-to:references :in-reply-to:references; bh=cwmzbNLKzNPM7p1XwHivBctO4Lj4BnF26+EZy+A4Qk4=; b=B9fKuhcrZLNhwZPyt9xE4Uf+2ZT27V1XEs3NgZ6OJci1gr/USFsHoEPJlLPdHS1tfx fNWtjxXzlXATD4Oi4j8YLUo0/5Di3Qcr26Wvanu8QbUq/Uk5YLJSDo4lnPnri7ULxDtx 4s8Dc476mk2N0JloQ+F39uhllJ2ovwQz4ixl4KEXwZiXCTs0u9yK30SF51W492x/gByO lQY6G5g7Wcng9SQ57LIoVw1aApaVyh1l45Ag67WssCaSY+S+iX3dd0U/blhEcopM1rWR WlZDzsOqW5g6yYFIqhFFT3sYyMDBeJwKh/5wx/UhWHPc2YKdbiMpSJ1kteOQ9O1WRbWg eKlg== 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:in-reply-to:references; bh=cwmzbNLKzNPM7p1XwHivBctO4Lj4BnF26+EZy+A4Qk4=; b=RBzemav70FCFcqCIgMgwRJfGk8fxqV1QDqT+Xcj1UiAiiw408iQe0OMSDX06xH4xGT lBGa2ppgkbrKHo88Qvwh/YMht8eUou8SCvFQxKbUTDuOfUr5eUeRqcmj8eKRFjpXc87i t8WMS1a9Idu1yFK/nvpQFKuS7BgD13gN2KqtWvXJ1aa8NO3ZD1azEWNR4cY3EkT9eXuV Qf8AOzG4HCIkLjGUtSOd8sxknD/YP/HtU1vzHbJtFYnE/m7uuprKJgUcPoIXJqpSNvim o5+C+iasnRxapjvfdQX8yDSmTdB778wo3qEeiW8AY6AcGctG/s9H6tHZZHDFbuEvtLiK WS2w== X-Gm-Message-State: APjAAAUANqzX59YyDTC+ILYJdziIFNw1yZX+tkGr67lJ73dYj9UqeW7B CRncV4JJXeECmoFCj3mulmDNHAQaBkU= X-Google-Smtp-Source: APXvYqzNWEhSQPWOgDkSO8OBlA+7QxC0hOvWotammDuxju+stIgXBHCaIhHFyR2nBr+Q5ib7ANhRJg== X-Received: by 2002:a63:c04a:: with SMTP id z10mr17688800pgi.115.1552910796963; Mon, 18 Mar 2019 05:06:36 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id v2sm17463497pfg.118.2019.03.18.05.06.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:06:35 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 02/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DELAYED_SACK sockopt Date: Mon, 18 Mar 2019 20:06:00 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_DELAYED_SACK sockopt. Fixes: 9c5829e1c49e ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DELAYED_SACK sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d0e5c62..4c5821b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -2920,6 +2920,9 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + params.sack_assoc_id = SCTP_FUTURE_ASSOC; + if (params.sack_assoc_id == SCTP_FUTURE_ASSOC || params.sack_assoc_id == SCTP_ALL_ASSOC) { if (params.sack_delay) { From patchwork Mon Mar 18 12:06:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057844 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="ISV7gEYi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFKM2r23z9s3q for ; Mon, 18 Mar 2019 23:06:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727457AbfCRMGq (ORCPT ); Mon, 18 Mar 2019 08:06:46 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:41292 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMGq (ORCPT ); Mon, 18 Mar 2019 08:06:46 -0400 Received: by mail-pf1-f194.google.com with SMTP id d25so11097242pfn.8; Mon, 18 Mar 2019 05:06:46 -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:in-reply-to:references :in-reply-to:references; bh=0chaWC4lk1EzP90P0h1p20Ngzc8bpCiTB97t8N7W3ZM=; b=ISV7gEYiR4outpgWtmnJuHelcQl2rZIZ8FFy5JsPhRpXd9E1RQigitRdK8oFhrQ7pF 0mXWekSF9UvhiqrC8jaWRa1d6oBM+a9URlfyUvO0XbBGM5v6erjGWG8nRi3bnItaXM59 GYKZVk1UE+8iUhoFxodJ4evJa9oIWETcvRziSDBB4iiAGVC/jBTnvfesGpgRdU19ZS+S mUyXx0cLypHilhdPF7y6LbfOgHbqUH4cJ5CHe3hibPl43UeKjX3hiJ6lAGbksAUfVJjs WksqZd5cwEFSnKoNtnuTEtrcpGUVwcfovwEeK++bB2Vpr0CYW+oMSl/AWH8TWpyjL7Tf lZnA== 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:in-reply-to:references; bh=0chaWC4lk1EzP90P0h1p20Ngzc8bpCiTB97t8N7W3ZM=; b=fuDUEtBZlYNZs+ONmvGdZz86zfP6i5Tugs97T1cGEUcoO2R4sae/dPUSCSOiYZpIEg LyOdGupJO/8vG2/XDA+bXDeBf4ci/ebMkC9y6Hy0l195l7JHGK1AeWUVWD6Tbswe3kQ9 zb4NsewUM5jz8boxJoBukBaxdcr55u3TiXC56zDD5CX3335HvGXhnU+V9B6JhS0Ex9Ia +cQGaAB5doZRCmJu1PJ69uQ41gB0DW0JaCBIZ7VZ4hoKITD83NPsROOp4elbKSucQRgI xWHHQKQBEm5ZSrV/B+UcsDoWZZrGntyQ/9s0t8awlRkleR1I42T5lIw7yCQ8jrClXwNq ljHA== X-Gm-Message-State: APjAAAWp0ZMlqs9M+y6Qi4q1iWjQslCZw9EryqEM4MaLHS+3YoDBPdVO tEXmPR2/sJ+HDlrlOJp4LrcwBGsHeUk= X-Google-Smtp-Source: APXvYqxUWbkrLjqUvgek+mFjn+XVOc1ByvpAsMfEJuYEnhzrusy/qgXX+P6zpfYCGeq5DDD+FAFTsA== X-Received: by 2002:a17:902:1123:: with SMTP id d32mr19006730pla.16.1552910805385; Mon, 18 Mar 2019 05:06:45 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id m79sm34267163pfi.60.2019.03.18.05.06.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:06:44 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 03/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SNDINFO sockopt Date: Mon, 18 Mar 2019 20:06:01 +0800 Message-Id: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_DEFAULT_SNDINFO sockopt. Fixes: 92fc3bd928c9 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_SNDINFO sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 4c5821b..3bac039 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3087,6 +3087,9 @@ static int sctp_setsockopt_default_sndinfo(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + info.snd_assoc_id = SCTP_FUTURE_ASSOC; + if (info.snd_assoc_id == SCTP_FUTURE_ASSOC || info.snd_assoc_id == SCTP_ALL_ASSOC) { sp->default_stream = info.snd_sid; From patchwork Mon Mar 18 12:06:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057845 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="IW6tptt8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFKY0svmz9s3q for ; Mon, 18 Mar 2019 23:06:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727490AbfCRMGz (ORCPT ); Mon, 18 Mar 2019 08:06:55 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:46315 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMGz (ORCPT ); Mon, 18 Mar 2019 08:06:55 -0400 Received: by mail-pg1-f195.google.com with SMTP id a22so11198079pgg.13; Mon, 18 Mar 2019 05:06:54 -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:in-reply-to:references :in-reply-to:references; bh=09wigGZFIqLCye2D2+f7jmE6e801A+NvJcJ3kwrBXWY=; b=IW6tptt87GRA+EBvA43y19Y73ZPlYR9F5JccGq0IOHPMRRh6fmV/FOADtDx2sYB2aH Xy3QNMSVKaFhiKMp2koxpjMkxMwKehHaPUz2dC88mgeXhFRJlVWaVUNpgy3l86sx2CPS xJeiMUmZZQFsAbwQ7EOq7Xi1pF7e8pY4tsraSj2S41+COkI878drFnj7uO0rAEBlLqgv BtUCcgy9ZYxPFeudE0Y/OY71TjSpF/onDlAwvC36jedKv0oDDKr4nUnMFApMr3BY7Ued hZ+qwuKtEzIwG+UkBxCpP8L/PsqQy4AdWGNM7b5/OtdzJZc/VGymaC//qRhOVZmZ74WZ 2xFA== 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:in-reply-to:references; bh=09wigGZFIqLCye2D2+f7jmE6e801A+NvJcJ3kwrBXWY=; b=Dv3QlHegfudG387ki7M5fG2/UAEfXng+Fma9L2AVps5xwq5femFuKK3gAFQ1lZIQZ6 wl7oIZPmW1YnBIK1LylBIx272xNwYnGu/Gsi/AeuqvZsvuOhMuqKlV4Pq3BQmDgi4goZ cnTSddXJbrL9IGcbe7uE27xnHkxsnOWRah5VNkzHMJCAuXWr4eiyL4xrpzB2FGKg4eZY wV3NLIH17sJJsWkijBFsu5q6798n9MFQJXo0FgC0C4PQU5qxfQefkbtaVCZvCVUbOOzJ u6+SHFvwrixgt/cwaYLWrTjnUvbgMLv5P30jifRSrRZLpDIq7vkKaqBT738Mrv8cxmzG yqdA== X-Gm-Message-State: APjAAAWQkV4M/MdhOedUitXVlzsg+N3QUcL1Rd6UY/fZqItnFY92rwX9 kMhJ4vyDm2mcuGThggEJxS+kbEENONU= X-Google-Smtp-Source: APXvYqzd0RjTsAQI7KwflZSO61nlaMrhuao4Wr0YW1yHnF+1K+O+gnn4rst44CyTduuLHS3aOceptA== X-Received: by 2002:a62:fb10:: with SMTP id x16mr18923127pfm.5.1552910813982; Mon, 18 Mar 2019 05:06:53 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id f3sm14589846pfn.100.2019.03.18.05.06.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:06:53 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 04/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_CONTEXT sockopt Date: Mon, 18 Mar 2019 20:06:02 +0800 Message-Id: <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_CONTEXT sockopt. Fixes: 49b037acca8c ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_CONTEXT sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 3bac039..b024a62 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3540,6 +3540,9 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval, return 0; } + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id == SCTP_FUTURE_ASSOC || params.assoc_id == SCTP_ALL_ASSOC) sp->default_rcv_context = params.assoc_value; From patchwork Mon Mar 18 12:06:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057846 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="m2ksz+1V"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFKj46ZZz9s3q for ; Mon, 18 Mar 2019 23:07:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727500AbfCRMHE (ORCPT ); Mon, 18 Mar 2019 08:07:04 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35363 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMHE (ORCPT ); Mon, 18 Mar 2019 08:07:04 -0400 Received: by mail-pg1-f196.google.com with SMTP id g8so571533pgf.2; Mon, 18 Mar 2019 05:07:03 -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:in-reply-to:references :in-reply-to:references; bh=+c9dV/YB/vg8fI6iC674p+a5IqvFJcSHXHSBwYAFGOA=; b=m2ksz+1Vn/7EbG6CgIW7l9IFI6iAZ0OEJLz60mVmpxFETrR6FgLWuGkhhctIDXLvQp evLUGjjY8/mRUCuRVG5FyTKfDSqqhHAxntQ+DtFYp5nPGJ57M9yBI872ikFhrKVi4u8x FCNMVlL8bVOiEXFRhfnR66StKUsyfEUqxa8UeIE406M0Nyrh85wzQSz6edvd2uzrEcst eMKmMnukdUN5+l+l5ZfxeI/jnzdUwQJ0yVyfB7uDXQB/kXQsF6oX0B6DnDLazCyq4/Fr F1K3u0Wu4zSwN04QdC3pcmJIY5qUn0LB3Eb8ostKc+k89LoXLHz3pRAS+QKPv/wXR7E8 ugTQ== 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:in-reply-to:references; bh=+c9dV/YB/vg8fI6iC674p+a5IqvFJcSHXHSBwYAFGOA=; b=bHwvhtPPJjr/qCS4Wz2KUtHAK4hZR8KAS1reQA46MIVfcJEbLRL32sKT6o6appBwXx QM1YW6bzc1WYgWqYxqybUutrkZmR+LxkojegLJgcg3ggl9eMUcy1yxj0Gc1Oy3hRpdD3 azePZ1LWR1Oxrh3fnVGctffFOI7NsioLEDwgIC01qOyz55SEZ3SF5nHrzrvkFkFjZOCm uwpGQPXRfmojH/W/FaUQXphyXVzpwE0qY8CHtOKSRBMNyow/VwrsdJqQyiP8mJwiUIEE eptSCUF0uzC2R9kjGrKjlbDK8w8rWoKaxsCQlaMog0TsKZiNQVND8L0uMEAtVkRJb4AY ZAFg== X-Gm-Message-State: APjAAAVLvxmxOYyAARz8qw/XFPh/v1C+joaxUpjF0tBix5jj0VdqfWe0 wrRJbA5dja0bE/zndBKG+y0JD5Zpylo= X-Google-Smtp-Source: APXvYqx/PCmeuGlRMJaVV2e6EJ2jdXZlW1vOlarILMTL5jD4WOA43ebVmhiWduP0MA/zzywAvSmvLg== X-Received: by 2002:a63:1d03:: with SMTP id d3mr17263735pgd.42.1552910823091; Mon, 18 Mar 2019 05:07:03 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id c130sm17253860pfb.145.2019.03.18.05.07.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:01 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 05/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_MAX_BURST sockopt Date: Mon, 18 Mar 2019 20:06:03 +0800 Message-Id: <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_MAX_BURST sockopt. Fixes: e0651a0dc877 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_MAX_BURST sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index b024a62..df879b1 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3682,6 +3682,9 @@ static int sctp_setsockopt_maxburst(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id == SCTP_FUTURE_ASSOC || params.assoc_id == SCTP_ALL_ASSOC) sp->max_burst = params.assoc_value; From patchwork Mon Mar 18 12:06:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057847 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="pK9ApgeG"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFKt133zz9s3q for ; Mon, 18 Mar 2019 23:07:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727529AbfCRMHN (ORCPT ); Mon, 18 Mar 2019 08:07:13 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40321 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMHM (ORCPT ); Mon, 18 Mar 2019 08:07:12 -0400 Received: by mail-pg1-f196.google.com with SMTP id u9so11221793pgo.7; Mon, 18 Mar 2019 05:07:12 -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:in-reply-to:references :in-reply-to:references; bh=6VEBh4PKVVTatraNBQnHRt2tGT0yzq7WR30ueUN0Fxg=; b=pK9ApgeGlbS0kUyzqoqr5ILYtdHqIoW8TgRDrCUFi15yKdeklw3vpfwt+GVuNakMIW URLd2xJ+tBJFjsMvfWcp2ZKmIjhC339FBJEUGQRXZhwnrhDUwQBY8KMhWc8die110qUV bTd7mJFNRZ4HwcvD9sjeD52pGK3YxtpXOtY7eFc3YyX86hDjBeus3dKH2GobuqMepaZ7 nr5ORnoGtE/C6j2TxI1eb/QUOS4Eo/a6AFITZC2XSWWJ5Scc4QFNczMX0B7/KEHxCncG mYZbTDBAh4cdv+WqOjW668EgIc5JL/muCFqePZSKmJTs7TwabiMggoI0Qju1umKqYktf hjAA== 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:in-reply-to:references; bh=6VEBh4PKVVTatraNBQnHRt2tGT0yzq7WR30ueUN0Fxg=; b=qI5jnqasSSFrK+zACtxmZOJ7cf9pzzuYmHSzXs2aZMJo9DfRMb7+NW44IXVhkSOIhZ uWt8atPG5We6Yd1tvTNlKL8WbZ3V+KexrFrh5EZgvJ52GTDVwjALxm0z1FIwBt6e1/Yp kjY8QcSdnFfFclu3soJpPBPqm7pSSAlZFeTGOuSWNOmr+rGJcNDvL5hgolWFYXGfhkpT hAD4pd1NMxSRyF1XMciOxaJmvOaBgDMpYkkZ6shfx+Q3dtaBCzuHmSeVFCwcspJoWKOV BuGG1NWeJVx4sw9m4IKOA/SNmdaX57l2fxMZIF7aRTwfYPq8pySwb3rfcXvwS5jMRtro 9GhQ== X-Gm-Message-State: APjAAAWR5vyP8dT4Okp0VrA1SgrNGRs1SgGgDzhCvhUfh0EL4kflwrp8 uBVHM7Rk5yA4JbZ54Zv/Dxmaadkrg5s= X-Google-Smtp-Source: APXvYqx0x4dRXkIPuYn6+r9OD/ukKZNYK+x1bMgPXYdNSeFiiOZ88rTUmUbDh2kDtCoSk6d3HHQFWA== X-Received: by 2002:a65:5184:: with SMTP id h4mr17382674pgq.32.1552910831518; Mon, 18 Mar 2019 05:07:11 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d23sm17201869pfn.69.2019.03.18.05.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:10 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 06/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_KEY sockopt Date: Mon, 18 Mar 2019 20:06:04 +0800 Message-Id: <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_AUTH_KEY sockopt. Fixes: 7fb3be13a236 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_KEY sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index df879b1..2ac221c 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3813,6 +3813,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk, goto out; } + if (sctp_style(sk, TCP)) + authkey->sca_assoc_id = SCTP_FUTURE_ASSOC; + if (authkey->sca_assoc_id == SCTP_FUTURE_ASSOC || authkey->sca_assoc_id == SCTP_ALL_ASSOC) { ret = sctp_auth_set_key(ep, asoc, authkey); From patchwork Mon Mar 18 12:06:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057848 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="CBahgN8L"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFL25k7hz9s9N for ; Mon, 18 Mar 2019 23:07:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727565AbfCRMHV (ORCPT ); Mon, 18 Mar 2019 08:07:21 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:43403 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727518AbfCRMHU (ORCPT ); Mon, 18 Mar 2019 08:07:20 -0400 Received: by mail-pf1-f195.google.com with SMTP id c8so4456374pfd.10; Mon, 18 Mar 2019 05:07:20 -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:in-reply-to:references :in-reply-to:references; bh=wnFkwZngbbp9o5mLXIG5QfxN0H8kuyjtbuw3f3VoD14=; b=CBahgN8L3cs89fsbkhsto1DbEc8LQ7vp5xi9tkxpeYpJCKG55Xl1kizUfiki+sEJCD jiOkenMOG5qZ4n9HA5CbMvK+Ett8lILyYAKcx6pzz1G5e9rhqPOA/X6qgmaIqspyQAT4 Wtj4/Q4lj3UhKj+6d0e8BEFvmQdhECaORnwl5buXDjsTIWQdbx0vSa7bCeIpna3rIKaw mFhM7nPc8CuYAr+GUwslzO0Bt5PVS7U/GfCRlJnzV35s+aoQnli6Twm/yrZUeykpBCIn pli+b7Hn/pDDvJX0nIkJ7Omp8S0jpK0oO1olckRkyh06LHPS58oRnWgjHtcyGGMLa+2r N1CQ== 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:in-reply-to:references; bh=wnFkwZngbbp9o5mLXIG5QfxN0H8kuyjtbuw3f3VoD14=; b=Ian1xLNhhwSWWvH9fvn/mFOantBTFNRj08JMp1iWn+Zjd29Qhll6IFS53IDYFaS8yt 7yJzR8AYfxghPovpryy8PlZWQT9DB9zosWM46+0qp/ZjEuRfLt4Hs0JIm5tT0NF5QRhF kAIWlT/P1ptGdTrKgWroeVL7NliboasJAqsebPn4ZilvGNJHe9t0zqztHPIs+xbOyWYk 5yS/wuuSR57tS9rzF15xg09jDEAjT6/cOmcCh6UqGsL/vKM51wEctfkX14hiTBCxolnQ +lhTz1srlakcgBgVQnPUqokbCDLWQyHIb5WUeKmX18nasaRmIW06XAel7vc8OMSAYIkt 92ig== X-Gm-Message-State: APjAAAUnkjTI6LJdw3p26bWZkFkbBTyiPz3q2DtDavHqxSd7Ghq8u8p1 vETcLK95QiplgpRxD7J4kdSz0Buju4Q= X-Google-Smtp-Source: APXvYqxUdTBEqKYCZcw1BuJlNSBwnFDbUxwsH6jHJPq3ZmoLxFBkLaC5f1AVpV77wZIhmB5Kj9Ubew== X-Received: by 2002:a63:6193:: with SMTP id v141mr17272823pgb.392.1552910839885; Mon, 18 Mar 2019 05:07:19 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id s6sm13766195pfe.37.2019.03.18.05.07.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:19 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 07/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_ACTIVE_KEY sockopt Date: Mon, 18 Mar 2019 20:06:05 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_AUTH_ACTIVE_KEY sockopt. Fixes: bf9fb6ad4f29 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_ACTIVE_KEY sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 2ac221c..1d098f0 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3871,6 +3871,9 @@ static int sctp_setsockopt_active_key(struct sock *sk, if (asoc) return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber); + if (sctp_style(sk, TCP)) + val.scact_assoc_id = SCTP_FUTURE_ASSOC; + if (val.scact_assoc_id == SCTP_FUTURE_ASSOC || val.scact_assoc_id == SCTP_ALL_ASSOC) { ret = sctp_auth_set_active_key(ep, asoc, val.scact_keynumber); From patchwork Mon Mar 18 12:06:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057849 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="PZTWPyG8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFLC1KSYz9s9N for ; Mon, 18 Mar 2019 23:07:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727582AbfCRMHa (ORCPT ); Mon, 18 Mar 2019 08:07:30 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34118 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727079AbfCRMH3 (ORCPT ); Mon, 18 Mar 2019 08:07:29 -0400 Received: by mail-pg1-f196.google.com with SMTP id v12so11267498pgq.1; Mon, 18 Mar 2019 05:07:29 -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:in-reply-to:references :in-reply-to:references; bh=fniJOUy0HuaK+xD1FqHQp0BVQ/LaFKPWf4XljYu4mIA=; b=PZTWPyG8nC0xKvK6a8a5LRyPlQZ5ivxFFsmB2LAQIG8BncRreCjHjlnW7jaETf3NLs XdL+keXf+rEp3vQbQurGkRo+/pbZ0TKy0hZMOHGTIFO3f5nJVNQ86cPFqsEFh2Qi1e70 QVWpW0u0E/72CMNFMUg5B8t5EgJiyFkHvbMVt4QbQLpLxnaqSBc9xHxmhyFhtBsTq158 /dtVmGNUoDbyMvMEzzUvjsTBI7WKwMafEdyFta65SEGh5qzxiu6b4kD2SmoqWvvVLCpk mXMM2jcUoW2ERF1F27MynZrzCCoqEveTat/+X1tHiUMLm5z+u4/o+JIu7lE/5l6NShca V3xA== 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:in-reply-to:references; bh=fniJOUy0HuaK+xD1FqHQp0BVQ/LaFKPWf4XljYu4mIA=; b=Ju7U9/2Andoj4uGmezSo5bsCgDsDORe9JJ224oRwA+HV0cPT88l8Gpalih/q0A5EdK P5M8gbzcmAa7zxj7FLnGigWsEPmZsuKR0/QgveBS6ozobuWHjzztNnSpHV4FL/pfQePy wEKWXTF4VPoPEpv2ELxhB+vokN/tBeu5lF0zrhqPNnX4qe51+Teo3OYtxjiF5Kdc5Q7z d174g2u8+hNJGj8mhW7mYHp64RNhY0jb40kO8w83hrGpmasEUrZz1BftnwR10H2jzuUu Fw8LkysCuk/po4uRw6KLfAgqzHtrwPHgQsw61QsV1r4CKn2E63xpc9u3va6XUaGAQG+8 O4mQ== X-Gm-Message-State: APjAAAVKagJj9VnoPRFcjl+nqMBACbnKgQTLGrmz1t+vFXj2DrLki0br CWEnOh/fd6hJbfb32cY/UOirmRJxRa8= X-Google-Smtp-Source: APXvYqzdu1ABdcwFurOXW741m1nndkB1cWbRAKO73oUYsp3DaZuyOwytKQE4wNx+Sdc/tS2nfBL+5w== X-Received: by 2002:a17:902:3f83:: with SMTP id a3mr18825208pld.6.1552910848721; Mon, 18 Mar 2019 05:07:28 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l63sm14176510pfc.89.2019.03.18.05.07.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:27 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 08/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_DELETE_KEY sockopt Date: Mon, 18 Mar 2019 20:06:06 +0800 Message-Id: <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_AUTH_DELETE_KEY sockopt. Fixes: 3adcc300603e ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_DELETE_KEY sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 1d098f0..087ca0b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3925,6 +3925,9 @@ static int sctp_setsockopt_del_key(struct sock *sk, if (asoc) return sctp_auth_del_key_id(ep, asoc, val.scact_keynumber); + if (sctp_style(sk, TCP)) + val.scact_assoc_id = SCTP_FUTURE_ASSOC; + if (val.scact_assoc_id == SCTP_FUTURE_ASSOC || val.scact_assoc_id == SCTP_ALL_ASSOC) { ret = sctp_auth_del_key_id(ep, asoc, val.scact_keynumber); From patchwork Mon Mar 18 12:06:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057850 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="li18D5DC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFLM0ngBz9s3q for ; Mon, 18 Mar 2019 23:07:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727588AbfCRMHi (ORCPT ); Mon, 18 Mar 2019 08:07:38 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39709 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726911AbfCRMHi (ORCPT ); Mon, 18 Mar 2019 08:07:38 -0400 Received: by mail-pf1-f193.google.com with SMTP id i17so1337722pfo.6; Mon, 18 Mar 2019 05:07:37 -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:in-reply-to:references :in-reply-to:references; bh=EKT9S56mvtBW+jcK4TX80PmeCCljWxfuobiEKW+B91o=; b=li18D5DC8T+bWmBux2AI9dwcjiNKf+dF7KeZEuW360HZWfYZdowtxs7DNN1Eu5fjNi 5Er5WhNIH4WgMf+3YL5M24a8d3eHD5K093ZGbzolKFZXhVIuqcdGVHlvEVNGYsFNHw62 QtOZT+FpyDMenecj2RafSZZgdnZIwiAk8JwgKTt/ZTJD24tF6QxcQKSQu8VMD9IKQ7Wk aiK+4ZLbesdR034VVykRpaX7z0w8pyjudwrvb8hNwBaxEvys/tFUuU5czwKxaysogNmJ TqvBwL/uVkG+EBrcYXoyqHFJLoAJGoQhlefLBzaAmcFp4vu08B43u/0BUiLTWmKB6OvO 2DXA== 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:in-reply-to:references; bh=EKT9S56mvtBW+jcK4TX80PmeCCljWxfuobiEKW+B91o=; b=hqEa1r1aAp9u0880j8c32HGVmftIwvEIN0fV9vESWkUNBGCg9HOZ8QzFhJwMW7Jshp IJHgNtG7FobOzhhcjm8u5GYfeGpj8pD1D70+uR9xHGTC7Hn8s+AdL2uSFT/0A8SL8LZZ awtKyDZgy22IkL8Sb8thqFl5BWG09nd21a9c0fWBeetxtwFRHY4xoLZjdINMFhf8PMn+ xTl2X+3GzesQvQSWvtrrsSjT04gSsEVLsgCmTRuRcRtJjg+m8I7K1+fvtRxYaSo/gPwn s+18Lffh7N5HsLVKPIt5V9TjIysALSDdyC2Dx4NGtvg7WVxkAAI+EvWzTMMNE2vf1wZ/ gpNA== X-Gm-Message-State: APjAAAX7A4/Gdia0fy95N4o3ZmcItcTwteygQAGiJ6wzwCxtfYYG1sRh bog6a5byJ40ENJPbOlfkxZAYnTMrs1U= X-Google-Smtp-Source: APXvYqx9dXR7ZZzhcCh8lG4GXKz0f2nJCEJ1Ng440UGyorHPBGwZpBQ7bWnyCTluDwfy9jyB52ITuQ== X-Received: by 2002:aa7:838c:: with SMTP id u12mr18629501pfm.189.1552910857014; Mon, 18 Mar 2019 05:07:37 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id x23sm11705251pgf.10.2019.03.18.05.07.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:36 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 09/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_DEACTIVATE_KEY sockopt Date: Mon, 18 Mar 2019 20:06:07 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_AUTH_DEACTIVATE_KEY sockopt. Fixes: 2af66ff3edc7 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_DEACTIVATE_KEY sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 087ca0b..0187444 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3978,6 +3978,9 @@ static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval, if (asoc) return sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber); + if (sctp_style(sk, TCP)) + val.scact_assoc_id = SCTP_FUTURE_ASSOC; + if (val.scact_assoc_id == SCTP_FUTURE_ASSOC || val.scact_assoc_id == SCTP_ALL_ASSOC) { ret = sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber); From patchwork Mon Mar 18 12:06:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057851 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="kJIeNGGC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFLW2xX2z9s3q for ; Mon, 18 Mar 2019 23:07:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727600AbfCRMHq (ORCPT ); Mon, 18 Mar 2019 08:07:46 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:37045 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726897AbfCRMHq (ORCPT ); Mon, 18 Mar 2019 08:07:46 -0400 Received: by mail-pf1-f196.google.com with SMTP id 8so7706416pfr.4; Mon, 18 Mar 2019 05:07:46 -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:in-reply-to:references :in-reply-to:references; bh=UtJ6Wlf7gzxELFm7P7esCq3tLZ9Cxz+olSgu00HnZm8=; b=kJIeNGGCY4JXNWSttiLKNjuJSErZ3QVMGfEGU+Ert3cWbzXHElsxQkxNrvg/a18BNI ZPNqADorxH7vWeyuSohgguel39ILk922OR5zEkNZHNCHg2Pg7riq9Nlma8EXNobYrr3P rvyW/9X8uyQWvoNQeqU+N5/0qaYEaKKz8QhIvgtxJgIIlU9SFQO8mL6wfrvPLqu6B2A8 Z8gZoXVddUw4o77clu2sHpW3JI2VfdsCokjE1OsQD9+/zKTM4I5XKtyEd3USPvcgwI1k zOuhmdQEWYa/f8CjT8EgPH1JQndc579Qt7nnKqL4zeEwH4pAORD/QEV4ID6gf13tthoI Ar6g== 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:in-reply-to:references; bh=UtJ6Wlf7gzxELFm7P7esCq3tLZ9Cxz+olSgu00HnZm8=; b=GUF8RbE0iQ/PVPCX4l+8UVsMw0Z4qYl7GbWxxV6MRGvxQyd0q9jf1Z28EYb1PVfJp+ vuFoLuxI2YfFjljjvzFANG36WhyA8kOwPqjpPcur6dNzwBVE+LYUPoa4moIsm48YE4xc FIjy96fIZpEJUOfzfQnq9+NqWIzP1J1oPxBgfQgUsPLeKq/MPR3bDRD3vryTLD7WIfa/ EENxB9KUCHHsTajycntrccGKtM37kdpzzZq/DuF99P8cMO9WXK1ovgiDgsYV1/FmHkR7 KxYCPn/PcOTJ0bf9113GRP3wnS7n9Lxwz01z8uP8f2FdDMaX+EtmDruzfcPLzbLtwRHz NJZw== X-Gm-Message-State: APjAAAX8kJ3eqKPKI5Gzh9lw64lJkgZwir/ro1j3/IQJPdUyHsdW2KK9 3ZeT7fnnDXr1IZi6Rr7Hk+UMlt+Kl8o= X-Google-Smtp-Source: APXvYqzUXb48XZ8zGtLJo34PKUADST1HZ2RXGjIJLHB1nHDU6HTKgEl8+SIJRHxXUi+dMfsmYRld7Q== X-Received: by 2002:a62:55c7:: with SMTP id j190mr14785467pfb.226.1552910865412; Mon, 18 Mar 2019 05:07:45 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id m67sm16810681pfj.70.2019.03.18.05.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:44 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 10/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_PRINFO sockopt Date: Mon, 18 Mar 2019 20:06:08 +0800 Message-Id: <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_DEFAULT_PRINFO sockopt. Fixes: 3a583059d187 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_PRINFO sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 0187444..238e5c8 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4196,6 +4196,9 @@ static int sctp_setsockopt_default_prinfo(struct sock *sk, goto out; } + if (sctp_style(sk, TCP)) + info.pr_assoc_id = SCTP_FUTURE_ASSOC; + if (info.pr_assoc_id == SCTP_FUTURE_ASSOC || info.pr_assoc_id == SCTP_ALL_ASSOC) { SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy); From patchwork Mon Mar 18 12:06:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057852 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="CHwbpVMl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFLh2Sntz9s3q for ; Mon, 18 Mar 2019 23:07:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727610AbfCRMHz (ORCPT ); Mon, 18 Mar 2019 08:07:55 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:36749 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726435AbfCRMHz (ORCPT ); Mon, 18 Mar 2019 08:07:55 -0400 Received: by mail-pf1-f195.google.com with SMTP id p10so4301337pff.3; Mon, 18 Mar 2019 05:07:54 -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:in-reply-to:references :in-reply-to:references; bh=rZKr1nerhgxSPOwRIzCEi0iwKi5J01yuEvLb6bgA/cQ=; b=CHwbpVMlMUgJ8DnVCku9PnkadxR9AbGTzwY5bCE0bHXv6jjeAaFuR95BnfilVoJshh Aj0hW+Zz4zbV11kh7RZa2RUhJAnzzFsR2SRk5WhhEq8yzSLOLAJffcoi7hDnIPEuJwGC HiY8HdDc/NhW8Z/sahb+IderR8kYOioBY2j43yJNAvaqy1EGKRKsRIpvroQEoObr5Gu7 geWF1L0BHqZSOMWhoizVn2bfbXAmAmmQOb2bQBUksI5j9QqxndGHj/SleqG6Yjb3Assh wtWqynHS1aVyp3PCvn5GzE6WXo+lakD8SxDUjGHAL8L331KnM3iABrDEIunkyVbmtKb+ Twmw== 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:in-reply-to:references; bh=rZKr1nerhgxSPOwRIzCEi0iwKi5J01yuEvLb6bgA/cQ=; b=Z8VNZay9wDm47CuG3uhNDlgP4F0lMv7shnUiSx1rS8lm4JokUL+Ecj9pfGthkyQnmq O4NalwjlYjq8EzQdEz45aOcAlTX7GaGomatKR6hJ/LWZyPObD6d2kVA+m/ZJQVVep4J3 9XEb71Q+tK2g6d8FvsROlxSAaD+SbrWzTapo+6BkAX+q/7Gi5Orc5MgN2V8PNeVseYwz Fcidi1Rm8SajPZV9/1ZCjjtYL2veXZN3uC99dciuRCuw5eqydc9fbADx5FgWxsks2W4a MsZmShP+qcZXAiOpkP+3SGRYv53bu7MqZfgrvaXo5mwa/1+77opRjIp3Lp5vLXHMh1F0 YkHQ== X-Gm-Message-State: APjAAAVuOC6wN2fbyn9sL8XeuGrixYCZ5gbZpDmLiR6HtxEKFo6T5lqx PvQTDERfCzV5A72MTV9+wG8repuRSBc= X-Google-Smtp-Source: APXvYqzguz3wdEyaq894gxS3TLrwGlyR/+6DVy0RFBFDOJ5VtIwozOqp/jMwXvt3m80H2JbmU3FZVA== X-Received: by 2002:a17:902:e784:: with SMTP id cp4mr19401082plb.135.1552910874161; Mon, 18 Mar 2019 05:07:54 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id k26sm2550759pfo.111.2019.03.18.05.07.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:53 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 11/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_ENABLE_STREAM_RESET sockopt Date: Mon, 18 Mar 2019 20:06:09 +0800 Message-Id: <1b33cb70222974d65a7194a506c9e99d474732c2.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_ENABLE_STREAM_RESET sockopt. Fixes: 99a62135e127 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_ENABLE_STREAM_RESET sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 238e5c8..6b0ee89 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4281,6 +4281,9 @@ static int sctp_setsockopt_enable_strreset(struct sock *sk, goto out; } + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id == SCTP_FUTURE_ASSOC || params.assoc_id == SCTP_ALL_ASSOC) ep->strreset_enable = params.assoc_value; From patchwork Mon Mar 18 12:06:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057853 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="V4wtBKIc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFLy0PsJz9sBF for ; Mon, 18 Mar 2019 23:08:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727658AbfCRMIF (ORCPT ); Mon, 18 Mar 2019 08:08:05 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36573 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727643AbfCRMID (ORCPT ); Mon, 18 Mar 2019 08:08:03 -0400 Received: by mail-pg1-f195.google.com with SMTP id r124so11246684pgr.3; Mon, 18 Mar 2019 05:08:03 -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:in-reply-to:references :in-reply-to:references; bh=dZz3kRaZ69mOrO5KllbVNnmfKpsSsLjiKDgabgJgSx8=; b=V4wtBKIc7mKlRZc4xpN9m36Ej9Dw1MzvViij44p3Iem5EekZuaAoZ4die0AWDnpTGT LnSs4m5eMSDIhJ6BrfQ2tsQUQ5WPjpf70nbLdgeexQfQAnthGdn/BSY/1FED0pNmNFmK opf3evOQTGPj+Ui7pFodj4kjr8PGKOoimwRsK4c7dnJUKWcU4OVbX3wntJAShskhgzsf RUnbEohSRR39qdFTIyHd80WA5SyXnVD0Yo6/YmWjtwTIR64hPL0mKWE6a/dJJ03+8QaV /JzkbWSBTL4lDGAdgY9/CaOIz73W3rCPj7WRSY5s68DIMlRVPYvIzrp2/fEV7VVx+8A4 UNgQ== 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:in-reply-to:references; bh=dZz3kRaZ69mOrO5KllbVNnmfKpsSsLjiKDgabgJgSx8=; b=cxMxPO+0cUiehUtM7BkKhWL13tOdLhR7rR1rHac8+0ApdTUNvcAy86aMZLnuLzPTBK l+7pA0zYWkgLtXD0Mc9KVDSh/ci7g8k5LLAKW6qW1qSy+0y95cZwzFGRCP+fMnfWE01h Di4MCP2iNZqorA2bRb/wRYxIxwtIBXQuxSb0swK6wRnp43ObXLQtTkUmU2Ob0FrLv/G1 X9i+peRZO5JhdGasFeyB11OgGgQwl7H0AKNzbuGqLLlkVIHw0CNm9z2FvhJKIZJ0qa6Z iz7Nx4HSyS6AtLP50d53XvPuzZma8esYpIT83CNjUM/eyjPQfUfIYBe77tFJHn0VRdMD HfVA== X-Gm-Message-State: APjAAAW8JFjx4AHTEAqcW8oaDuxhdj3hi4XgavR/moUA/PgF+MrILXU7 6llkEcLTof1T+SFwakU5rADJQWp6SMs= X-Google-Smtp-Source: APXvYqyv8C6MFNbafZXdsgYQXdzDMgpqfP111Rv3qVJl71Mm14O/ByD9a8rN0zUEF2AWM5VYalM9Ag== X-Received: by 2002:a65:5c07:: with SMTP id u7mr17491662pgr.320.1552910882598; Mon, 18 Mar 2019 05:08:02 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d12sm8177476pfh.168.2019.03.18.05.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:08:01 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 12/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_EVENT sockopt Date: Mon, 18 Mar 2019 20:06:10 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <1b33cb70222974d65a7194a506c9e99d474732c2.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.1552910681.git.lucien.xin@gmail.com> <1b33cb70222974d65a7194a506c9e99d474732c2.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_EVENT sockopt. Fixes: d251f05e3ba2 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_EVENT sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 6b0ee89..10df48a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4574,6 +4574,9 @@ static int sctp_setsockopt_event(struct sock *sk, char __user *optval, if (asoc) return sctp_assoc_ulpevent_type_set(¶m, asoc); + if (sctp_style(sk, TCP)) + param.se_assoc_id = SCTP_FUTURE_ASSOC; + if (param.se_assoc_id == SCTP_FUTURE_ASSOC || param.se_assoc_id == SCTP_ALL_ASSOC) sctp_ulpevent_type_set(&sp->subscribe, From patchwork Mon Mar 18 12:06:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057854 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="ApdORMrd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFM04jMfz9sBF for ; Mon, 18 Mar 2019 23:08:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727676AbfCRMIM (ORCPT ); Mon, 18 Mar 2019 08:08:12 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33182 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726812AbfCRMIL (ORCPT ); Mon, 18 Mar 2019 08:08:11 -0400 Received: by mail-pg1-f194.google.com with SMTP id i7so8018424pgq.0; Mon, 18 Mar 2019 05:08:11 -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:in-reply-to:references :in-reply-to:references; bh=2LNkXg7HDRpFQWkgFO/L+GMKbEk62ZAMvdF+n3xk7yM=; b=ApdORMrdvuJcOCKz3xTYcRkfw/Q0Ts1WOFx79tCKgE+GpVNdRicbhgPODwv900cCHn niRetBxraLjiwTzS1XKtxQ1gFPjICI573LOyYIY+sEQFo64yRAQ4RrS6RAJoog7Vus2B +BzjTLTcoIpQMiVCUs5RNvcAL4iZlwLjQjMObU1kbKIULELe1UuQ5OD9kmJ4t/DeJfVb QAWejYoFccEw1rTwjoWutJ4LkCa4cRcDq6OGvB46BXgTAArU0YYQ+SkvM5TWYX7Lr6Uu VgLmcltBgJL4niEPCO/wxQLCF9K1fA5n1pQTFukWzwjqEdk4xmgfcv3zj0jHRwd6CeM4 MetQ== 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:in-reply-to:references; bh=2LNkXg7HDRpFQWkgFO/L+GMKbEk62ZAMvdF+n3xk7yM=; b=qgK4Z5Uq6QgTiSanRqWa73HFzvEVO67Ur+X8BKVpyQxOeQinfHIqB1iC+GzwS/8bDc bL6eDz+nctMJYEF50Cl13p2+Ukz3l2w/9Fy8cgI3hTUnVmvoZnSn0Jqbt3HGkK3n1R3H AWOdFhbaNsJ1XaNMZALyp7cS7H4ttEdWsivej3nB1ZLiK/SFyKRBXcSCiCEbtnwTU1L8 /5mg+9bfOmyVpGLXBaa7rejHtX2SO7Z5go2kQuMFxVJ7Z+sfHxgp3bdBxnW21BQiGWWT vb+/lEFFJ9aZwFfde/hMPIRjUCWFZXEjx+PzGKfQriLbyvUl7foiZK90/rXiI8VTYYSi ehnA== X-Gm-Message-State: APjAAAXrBbWxzOtZ9+LO9OjZAWimdXLUkCcxZJJFve8OHAkD7UwgvsHP kg9K1aHsBt2LmrsJ6FC4vS8qQUUObRQ= X-Google-Smtp-Source: APXvYqwUSEv9bqZiWYgKIqNZFu1DKPwUIzsQd9pygowwROzpcnkHdMlATqepcwX1IFl2REzRNSZ5HQ== X-Received: by 2002:a63:7843:: with SMTP id t64mr17441876pgc.178.1552910890936; Mon, 18 Mar 2019 05:08:10 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id m23sm9043726pfa.148.2019.03.18.05.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:08:10 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 13/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_STREAM_SCHEDULER sockopt Date: Mon, 18 Mar 2019 20:06:11 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.1552910681.git.lucien.xin@gmail.com> <1b33cb70222974d65a7194a506c9e99d474732c2.1552910681.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_STREAM_SCHEDULER sockopt. Fixes: 7efba10d6bd2 ("sctp: add SCTP_FUTURE_ASOC and SCTP_CURRENT_ASSOC for SCTP_STREAM_SCHEDULER sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 10df48a..011c349 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4409,6 +4409,9 @@ static int sctp_setsockopt_scheduler(struct sock *sk, if (asoc) return sctp_sched_set_sched(asoc, params.assoc_value); + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id == SCTP_FUTURE_ASSOC || params.assoc_id == SCTP_ALL_ASSOC) sp->default_ss = params.assoc_value;