Re: Ooops with SCTP

[Jason Gunthorpe <jgunthorpe@obsidianresearch.com>]

On Wed, Jul 09, 2014 at 11:50:15AM -0400, Neil Horman wrote:

> Sorry for the delay, busy few days.  I think this fixes up all the
> required call sites that check v4mapped.  I've not tested it yet,
> but it builds.  If you could please give it a spin and let me know,
> I'll officially propose it.

Thanks, I'll try and run it today..

> diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
> index 1999592..5261ac5 100644
> +++ b/net/sctp/ipv6.c
> @@ -434,12 +434,17 @@ static void sctp_v6_from_sk(union sctp_addr *addr, struct sock *sk)
>  /* Initialize sk->sk_rcv_saddr from sctp_addr. */
>  static void sctp_v6_to_sk_saddr(union sctp_addr *addr, struct sock *sk)
>  {
> -	if (addr->sa.sa_family = AF_INET && sctp_sk(sk)->v4mapped) {
> -		sk->sk_v6_rcv_saddr.s6_addr32[0] = 0;
> -		sk->sk_v6_rcv_saddr.s6_addr32[1] = 0;
> -		sk->sk_v6_rcv_saddr.s6_addr32[2] = htonl(0x0000ffff);
> -		sk->sk_v6_rcv_saddr.s6_addr32[3] > +	if (addr->sa.sa_family = AF_INET) {
> +		if (sctp_sk(sk)->v4mapped) {
> +			sk->sk_v6_rcv_saddr.s6_addr32[0] = 0;
> +			sk->sk_v6_rcv_saddr.s6_addr32[1] = 0;
> +			sk->sk_v6_rcv_saddr.s6_addr32[2] = htonl(0x0000ffff);
> +			sk->sk_v6_rcv_saddr.s6_addr32[3] >  			addr->v4.sin_addr.s_addr;
> +		} else {
> +			inet_sk(sk)->inet_rcv_saddr > +			addr->v4.sin_addr.s_addr;

Hum, this looks funny without a family assigment, how does the the
next thing to look at sk know if is a AF_INET vs AF_INET6?

> @@ -556,11 +566,10 @@ static int sctp_v6_available(union sctp_addr *addr, struct sctp_sock *sp)
>  	if (IPV6_ADDR_ANY = type)
>  		return 1;
>  	if (type = IPV6_ADDR_MAPPED) {
> -		if (sp && !sp->v4mapped)
> -			return 0;
>  		if (sp && ipv6_only_sock(sctp_opt2sk(sp)))
>  			return 0;
> -		sctp_v6_map_v4(addr);
> +		if (sp && sp->v4mapped)
> +			sctp_v6_map_v4(addr);

What scenario is required to go into this if? When I run my test I
did not hit (sp && !sp->v4mapped) ..

> @@ -587,11 +596,10 @@ static int sctp_v6_addr_valid(union sctp_addr *addr,
> -		sctp_v6_map_v4(addr);
> +		if (sp && sp->v4mapped)
> +			sctp_v6_map_v4(addr);

Ditto?

> @@ -739,12 +749,16 @@ static void sctp_inet6_event_msgname(struct sctp_ulpevent *event,
> +			} else {
> +				sin->sin_addr.s_addr = addr->v4.sin_addr.s_addr;
> +				sin->sin_family = AF_INET;

Missing port?

+                               sin->sin_port = htons(asoc->peer.port);

Jason