Commit 27d30b0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [XFRM]: Fix missing protocol comparison of larval SAs.
  [WANROUTER]: Delete superfluous source file "net/wanrouter/af_wanpipe.c".
  [IPV4]: Fix warning in ip_mc_rejoin_group.
  [ROSE]: Socket locking is a great invention.
  [ROSE]: Remove ourselves from waitqueue when receiving a signal
  [NetLabel]: parse the CIPSO ranged tag on incoming packets
parents 2cb8a57b 75e252d9

net/ipv4/cipso_ipv4.c

+5 −0
Original line number Diff line number Diff line
@@ -1933,6 +1933,11 @@ int cipso_v4_skbuff_getattr(const struct sk_buff *skb, 
						 &cipso_ptr[6],

						 secattr);

		break;

	case CIPSO_V4_TAG_RANGE:

		ret_val = cipso_v4_parsetag_rng(doi_def,

						&cipso_ptr[6],

						secattr);

		break;

	}



skbuff_getattr_return:

net/ipv4/igmp.c

+1 −1
Original line number Diff line number Diff line
@@ -1255,9 +1255,9 @@ out: 
 */

void ip_mc_rejoin_group(struct ip_mc_list *im)

{

#ifdef CONFIG_IP_MULTICAST

	struct in_device *in_dev = im->interface;



#ifdef CONFIG_IP_MULTICAST

	if (im->multiaddr == IGMP_ALL_HOSTS)

		return;

net/rose/af_rose.c

+52 −28
Original line number Diff line number Diff line
@@ -700,23 +700,7 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le 
	unsigned char cause, diagnostic;

	struct net_device *dev;

	ax25_uid_assoc *user;

	int n;



	if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) {

		sock->state = SS_CONNECTED;

		return 0;	/* Connect completed during a ERESTARTSYS event */

	}



	if (sk->sk_state == TCP_CLOSE && sock->state == SS_CONNECTING) {

		sock->state = SS_UNCONNECTED;

		return -ECONNREFUSED;

	}



	if (sk->sk_state == TCP_ESTABLISHED)

		return -EISCONN;	/* No reconnect on a seqpacket socket */



	sk->sk_state   = TCP_CLOSE;

	sock->state = SS_UNCONNECTED;

	int n, err = 0;



	if (addr_len != sizeof(struct sockaddr_rose) && addr_len != sizeof(struct full_sockaddr_rose))

		return -EINVAL;
@@ -734,24 +718,53 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le 
	if ((rose->source_ndigis + addr->srose_ndigis) > ROSE_MAX_DIGIS)

		return -EINVAL;



	lock_sock(sk);



	if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) {

		/* Connect completed during a ERESTARTSYS event */

		sock->state = SS_CONNECTED;

		goto out_release;

	}



	if (sk->sk_state == TCP_CLOSE && sock->state == SS_CONNECTING) {

		sock->state = SS_UNCONNECTED;

		err = -ECONNREFUSED;

		goto out_release;

	}



	if (sk->sk_state == TCP_ESTABLISHED) {

		/* No reconnect on a seqpacket socket */

		err = -EISCONN;

		goto out_release;

	}



	sk->sk_state   = TCP_CLOSE;

	sock->state = SS_UNCONNECTED;



	rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause,

					 &diagnostic);

	if (!rose->neighbour)

		return -ENETUNREACH;



	rose->lci = rose_new_lci(rose->neighbour);

	if (!rose->lci)

		return -ENETUNREACH;

	if (!rose->lci) {

		err = -ENETUNREACH;

		goto out_release;

	}



	if (sock_flag(sk, SOCK_ZAPPED)) {	/* Must bind first - autobinding in this may or may not work */

		sock_reset_flag(sk, SOCK_ZAPPED);



		if ((dev = rose_dev_first()) == NULL)

			return -ENETUNREACH;

		if ((dev = rose_dev_first()) == NULL) {

			err = -ENETUNREACH;

			goto out_release;

		}



		user = ax25_findbyuid(current->euid);

		if (!user)

			return -EINVAL;

		if (!user) {

			err = -EINVAL;

			goto out_release;

		}



		memcpy(&rose->source_addr, dev->dev_addr, ROSE_ADDR_LEN);

		rose->source_call = user->call;
@@ -789,8 +802,10 @@ rose_try_next_neigh: 
	rose_start_t1timer(sk);



	/* Now the loop */

	if (sk->sk_state != TCP_ESTABLISHED && (flags & O_NONBLOCK))

		return -EINPROGRESS;

	if (sk->sk_state != TCP_ESTABLISHED && (flags & O_NONBLOCK)) {

		err = -EINPROGRESS;

		goto out_release;

	}



	/*

	 * A Connect Ack with Choke or timeout or failed routing will go to
@@ -805,8 +820,10 @@ rose_try_next_neigh: 
			set_current_state(TASK_INTERRUPTIBLE);

			if (sk->sk_state != TCP_SYN_SENT)

				break;

			release_sock(sk);

			if (!signal_pending(tsk)) {

				schedule();

				lock_sock(sk);

				continue;

			}

			current->state = TASK_RUNNING;
@@ -822,14 +839,19 @@ rose_try_next_neigh: 
		rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, &diagnostic);

		if (rose->neighbour)

			goto rose_try_next_neigh;

	/* No more neighbour */



		/* No more neighbours */

		sock->state = SS_UNCONNECTED;

		return sock_error(sk);	/* Always set at this point */

		err = sock_error(sk);	/* Always set at this point */

		goto out_release;

	}



	sock->state = SS_CONNECTED;



	return 0;

out_release:

	release_sock(sk);



	return err;

}



static int rose_accept(struct socket *sock, struct socket *newsock, int flags)
@@ -877,6 +899,8 @@ static int rose_accept(struct socket *sock, struct socket *newsock, int flags) 
			lock_sock(sk);

			continue;

		}

		current->state = TASK_RUNNING;

		remove_wait_queue(sk->sk_sleep, &wait);

		return -ERESTARTSYS;

	}

	current->state = TASK_RUNNING;

net/wanrouter/af_wanpipe.c

deleted100644 → 0
+0 −2600

File deleted.

Preview size limit exceeded, changes collapsed.

net/xfrm/xfrm_state.c

+4 −2
Original line number Diff line number Diff line
@@ -704,7 +704,8 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re 
		    x->props.mode   != mode ||

		    x->props.family != family ||

		    x->km.state     != XFRM_STATE_ACQ ||

		    x->id.spi       != 0)

		    x->id.spi       != 0 ||

		    x->id.proto	    != proto)

			continue;



		switch (family) {
@@ -801,7 +802,8 @@ int xfrm_state_add(struct xfrm_state *x) 


	if (use_spi && x->km.seq) {

		x1 = __xfrm_find_acq_byseq(x->km.seq);

		if (x1 && xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family)) {

		if (x1 && ((x1->id.proto != x->id.proto) ||

		    xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) {

			xfrm_state_put(x1);

			x1 = NULL;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE