From: Xin Long <lucien.xin@gmail.com>
To: David Laight <David.Laight@aculab.com>
Cc: network dev <netdev@vger.kernel.org>,
"linux-sctp@vger.kernel.org" <linux-sctp@vger.kernel.org>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
"davem@davemloft.net" <davem@davemloft.net>
Subject: Re: [PATCH net-next 5/5] sctp: add spt_pathcpthld in struct sctp_paddrthlds
Date: Wed, 11 Sep 2019 16:51:41 +0800 [thread overview]
Message-ID: <CADvbK_d_Emw0K2Uq4P9OanRBr52tNjMsAOiJNi0TGsuWt6+81A@mail.gmail.com> (raw)
In-Reply-To: <9fc7ca1598e641cda3914840a4416aab@AcuMS.aculab.com>
On Tue, Sep 10, 2019 at 9:19 PM David Laight <David.Laight@aculab.com> wrote:
>
> From: Xin Long
> > Sent: 09 September 2019 08:57
> > Section 7.2 of rfc7829: "Peer Address Thresholds (SCTP_PEER_ADDR_THLDS)
> > Socket Option" extends 'struct sctp_paddrthlds' with 'spt_pathcpthld'
> > added to allow a user to change ps_retrans per sock/asoc/transport, as
> > other 2 paddrthlds: pf_retrans, pathmaxrxt.
> >
> > Note that ps_retrans is not allowed to be greater than pf_retrans.
> >
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> > ---
> > include/uapi/linux/sctp.h | 1 +
> > net/sctp/socket.c | 10 ++++++++++
> > 2 files changed, 11 insertions(+)
> >
> > diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
> > index a15cc28..dfd81e1 100644
> > --- a/include/uapi/linux/sctp.h
> > +++ b/include/uapi/linux/sctp.h
> > @@ -1069,6 +1069,7 @@ struct sctp_paddrthlds {
> > struct sockaddr_storage spt_address;
> > __u16 spt_pathmaxrxt;
> > __u16 spt_pathpfthld;
> > + __u16 spt_pathcpthld;
> > };
> >
> > /*
> > diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> > index 5e2098b..5b9774d 100644
> > --- a/net/sctp/socket.c
> > +++ b/net/sctp/socket.c
> > @@ -3954,6 +3954,9 @@ static int sctp_setsockopt_paddr_thresholds(struct sock *sk,
>
> This code does:
> if (optlen < sizeof(struct sctp_paddrthlds))
> return -EINVAL;
here will become:
if (optlen >= sizeof(struct sctp_paddrthlds)) {
optlen = sizeof(struct sctp_paddrthlds);
} else if (optlen >= ALIGN(offsetof(struct sctp_paddrthlds,
spt_pathcpthld), 4))
optlen = ALIGN(offsetof(struct sctp_paddrthlds,
spt_pathcpthld), 4);
val.spt_pathcpthld = 0xffff;
else {
return -EINVAL;
}
if (copy_from_user(&val, (struct sctp_paddrthlds __user *)optval,
optlen))
return -EFAULT;
in sctp_getsockopt_paddr_thresholds():
if (len >= sizeof(struct sctp_paddrthlds))
len = sizeof(struct sctp_paddrthlds);
else if (len >= ALIGN(offsetof(struct sctp_paddrthlds,
spt_pathcpthld), 4))
len = ALIGN(offsetof(struct sctp_paddrthlds,
spt_pathcpthld), 4);
else
return -EINVAL;
if (copy_from_user(&val, (struct sctp_paddrthlds __user *)optval, len))
return -EFAULT;
>
> So adding an extra field breaks existing application binaries
> that use this option.
>
> I've not checked the other patches or similar fubar.
>
> David
>
> -
> Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
> Registration No: 1397386 (Wales)
>
next prev parent reply other threads:[~2019-09-11 8:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 7:56 [PATCH net-next 0/5] sctp: update from rfc7829 Xin Long
2019-09-09 7:56 ` [PATCH net-next 1/5] sctp: add SCTP_ADDR_POTENTIALLY_FAILED notification Xin Long
2019-09-09 7:56 ` [PATCH net-next 2/5] sctp: add pf_expose per netns and sock and asoc Xin Long
2019-09-09 7:56 ` [PATCH net-next 3/5] sctp: add SCTP_EXPOSE_POTENTIALLY_FAILED_STATE sockopt Xin Long
2019-09-09 7:56 ` [PATCH net-next 4/5] sctp: add support for Primary Path Switchover Xin Long
2019-09-09 7:56 ` [PATCH net-next 5/5] sctp: add spt_pathcpthld in struct sctp_paddrthlds Xin Long
2019-09-10 13:19 ` David Laight
2019-09-11 8:51 ` Xin Long [this message]
2019-09-11 9:03 ` David Laight
2019-09-11 9:21 ` Xin Long
2019-09-11 9:38 ` Xin Long
2019-09-11 12:56 ` Marcelo Ricardo Leitner
2019-09-11 17:47 ` Xin Long
2019-09-12 22:51 ` Marcelo Ricardo Leitner
2019-09-13 8:36 ` David Laight
2019-09-13 13:19 ` 'Marcelo Ricardo Leitner'
2019-09-13 13:31 ` David Laight
2019-09-13 13:40 ` 'Marcelo Ricardo Leitner'
2019-09-10 17:27 ` David Miller
2019-09-11 8:14 ` Xin Long
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADvbK_d_Emw0K2Uq4P9OanRBr52tNjMsAOiJNi0TGsuWt6+81A@mail.gmail.com \
--to=lucien.xin@gmail.com \
--cc=David.Laight@aculab.com \
--cc=davem@davemloft.net \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).