From 348fdaef610a654ffd041375d8b6ec91322dbb82 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 7 Dec 2010 17:11:09 +0000 Subject: [PATCH] --- yaml --- r: 223245 b: refs/heads/master c: 40a010395cd66053f07bffeb3da5e44683bac30e h: refs/heads/master i: 223243: ebcfccd062bcbdf717de3cd258c171a76f54a3f5 v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4668b7795e43..525db496a808 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79aeec5822cea63cf732bbc0c9f3337542352616 +refs/heads/master: 40a010395cd66053f07bffeb3da5e44683bac30e diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index 6bd554323a34..0b9ee34ad35c 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -2932,6 +2932,7 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva struct sctp_association *asoc = NULL; struct sctp_setpeerprim prim; struct sctp_chunk *chunk; + struct sctp_af *af; int err; sp = sctp_sk(sk); @@ -2959,6 +2960,13 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva if (!sctp_state(asoc, ESTABLISHED)) return -ENOTCONN; + af = sctp_get_af_specific(prim.sspp_addr.ss_family); + if (!af) + return -EINVAL; + + if (!af->addr_valid((union sctp_addr *)&prim.sspp_addr, sp, NULL)) + return -EADDRNOTAVAIL; + if (!sctp_assoc_lookup_laddr(asoc, (union sctp_addr *)&prim.sspp_addr)) return -EADDRNOTAVAIL;