netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xin Long <lucien.xin@gmail.com>
To: network dev <netdev@vger.kernel.org>
Cc: mleitner@redhat.com, davem@davemloft.net, vyasevic@redhat.com
Subject: [PATCH net v4] sctp: asconf's process should verify address parameter is in the beginning
Date: Thu, 27 Aug 2015 05:03:24 +0800	[thread overview]
Message-ID: <e003fc0660f6b2eefd25618ea7a037e62952a54d.1440623004.git.lucien.xin@gmail.com> (raw)

in sctp_process_asconf(), we get address parameter from the beginning of
the addip params. but we never check if it's really there. if the addr
param is not there, it still can pass sctp_verify_asconf(), then to be
handled by sctp_process_asconf(), it will not be safe.

so add detection in sctp_verify_asconf() to check the address parameter is in
the beginning, or return false to send abort.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
---
 net/sctp/sm_make_chunk.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 06320c8..f3fc881 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -3132,12 +3132,14 @@ bool sctp_verify_asconf(const struct sctp_association *asoc,
 		case SCTP_PARAM_IPV4_ADDRESS:
 			if (length != sizeof(sctp_ipv4addr_param_t))
 				return false;
-			addr_param_seen = true;
+			if (param.v == addip->addip_hdr.params)
+				addr_param_seen = true;
 			break;
 		case SCTP_PARAM_IPV6_ADDRESS:
 			if (length != sizeof(sctp_ipv6addr_param_t))
 				return false;
-			addr_param_seen = true;
+			if (param.v == addip->addip_hdr.params)
+				addr_param_seen = true;
 			break;
 		case SCTP_PARAM_ADD_IP:
 		case SCTP_PARAM_DEL_IP:
-- 
2.1.0

             reply	other threads:[~2015-08-26 21:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-26 21:03 Xin Long [this message]
2015-08-26 21:33 ` [PATCH net v4] sctp: asconf's process should verify address parameter is in the beginning Vlad Yasevich
2015-08-27  8:25   ` lucien xin
  -- strict thread matches above, loose matches on Subject: below --
2015-08-27  8:26 Xin Long
2015-08-27 12:46 ` Vlad Yasevich
2015-08-27 21:00 ` David Miller

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=e003fc0660f6b2eefd25618ea7a037e62952a54d.1440623004.git.lucien.xin@gmail.com \
    --to=lucien.xin@gmail.com \
    --cc=davem@davemloft.net \
    --cc=mleitner@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=vyasevic@redhat.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).