| Message ID | d89c1e422158d21710ce938aa093a20960bd55e9.1529509634.git.marcelo.leitner@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] sctp: fix erroneous inc of snmp SctpFragUsrMsgs | expand |
On Wed, Jun 20, 2018 at 12:47:52PM -0300, Marcelo Ricardo Leitner wrote: > 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 <marcelo.leitner@gmail.com> > --- > 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; > -- > 2.14.4 > > Acked-by: Neil Horman <nhorman@redhat.com>
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Date: Wed, 20 Jun 2018 12:47:52 -0300 > 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 <marcelo.leitner@gmail.com> Applied.
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;
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 <marcelo.leitner@gmail.com> --- net/sctp/chunk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)