Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05e31754 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [TCP]: Fix MD5 signature handling on big-endian.
  [NET]: Zero length write() on socket should not simply return 0.
parents b082dff3 f8ab18d2

include/net/tcp.h

+2 −4
Original line number Diff line number Diff line
@@ -1059,14 +1059,12 @@ struct tcp_md5sig_key { 
};



struct tcp4_md5sig_key {

	u8			*key;

	u16			keylen;

	struct tcp_md5sig_key	base;

	__be32			addr;

};



struct tcp6_md5sig_key {

	u8			*key;

	u16			keylen;

	struct tcp_md5sig_key	base;

#if 0

	u32			scope_id;	/* XXX */

#endif

net/ipv4/tcp_ipv4.c

+9 −10
Original line number Diff line number Diff line
@@ -833,8 +833,7 @@ static struct tcp_md5sig_key * 
		return NULL;

	for (i = 0; i < tp->md5sig_info->entries4; i++) {

		if (tp->md5sig_info->keys4[i].addr == addr)

			return (struct tcp_md5sig_key *)

						&tp->md5sig_info->keys4[i];

			return &tp->md5sig_info->keys4[i].base;

	}

	return NULL;

}
@@ -865,9 +864,9 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, 
	key = (struct tcp4_md5sig_key *)tcp_v4_md5_do_lookup(sk, addr);

	if (key) {

		/* Pre-existing entry - just update that one. */

		kfree(key->key);

		key->key = newkey;

		key->keylen = newkeylen;

		kfree(key->base.key);

		key->base.key = newkey;

		key->base.keylen = newkeylen;

	} else {

		struct tcp_md5sig_info *md5sig;
@@ -907,8 +906,8 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, 
		}

		md5sig->entries4++;

		md5sig->keys4[md5sig->entries4 - 1].addr        = addr;

		md5sig->keys4[md5sig->entries4 - 1].key    = newkey;

		md5sig->keys4[md5sig->entries4 - 1].keylen = newkeylen;

		md5sig->keys4[md5sig->entries4 - 1].base.key    = newkey;

		md5sig->keys4[md5sig->entries4 - 1].base.keylen = newkeylen;

	}

	return 0;

}
@@ -930,7 +929,7 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr) 
	for (i = 0; i < tp->md5sig_info->entries4; i++) {

		if (tp->md5sig_info->keys4[i].addr == addr) {

			/* Free the key */

			kfree(tp->md5sig_info->keys4[i].key);

			kfree(tp->md5sig_info->keys4[i].base.key);

			tp->md5sig_info->entries4--;



			if (tp->md5sig_info->entries4 == 0) {
@@ -964,7 +963,7 @@ static void tcp_v4_clear_md5_list(struct sock *sk) 
	if (tp->md5sig_info->entries4) {

		int i;

		for (i = 0; i < tp->md5sig_info->entries4; i++)

			kfree(tp->md5sig_info->keys4[i].key);

			kfree(tp->md5sig_info->keys4[i].base.key);

		tp->md5sig_info->entries4 = 0;

		tcp_free_md5sig_pool();

	}

net/ipv6/tcp_ipv6.c

+9 −9
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk, 


	for (i = 0; i < tp->md5sig_info->entries6; i++) {

		if (ipv6_addr_cmp(&tp->md5sig_info->keys6[i].addr, addr) == 0)

			return (struct tcp_md5sig_key *)&tp->md5sig_info->keys6[i];

			return &tp->md5sig_info->keys6[i].base;

	}

	return NULL;

}
@@ -567,9 +567,9 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer, 
	key = (struct tcp6_md5sig_key*) tcp_v6_md5_do_lookup(sk, peer);

	if (key) {

		/* modify existing entry - just update that one */

		kfree(key->key);

		key->key = newkey;

		key->keylen = newkeylen;

		kfree(key->base.key);

		key->base.key = newkey;

		key->base.keylen = newkeylen;

	} else {

		/* reallocate new list if current one is full. */

		if (!tp->md5sig_info) {
@@ -603,8 +603,8 @@ static int tcp_v6_md5_do_add(struct sock *sk, struct in6_addr *peer, 


		ipv6_addr_copy(&tp->md5sig_info->keys6[tp->md5sig_info->entries6].addr,

			       peer);

		tp->md5sig_info->keys6[tp->md5sig_info->entries6].key = newkey;

		tp->md5sig_info->keys6[tp->md5sig_info->entries6].keylen = newkeylen;

		tp->md5sig_info->keys6[tp->md5sig_info->entries6].base.key = newkey;

		tp->md5sig_info->keys6[tp->md5sig_info->entries6].base.keylen = newkeylen;



		tp->md5sig_info->entries6++;

	}
@@ -626,7 +626,7 @@ static int tcp_v6_md5_do_del(struct sock *sk, struct in6_addr *peer) 
	for (i = 0; i < tp->md5sig_info->entries6; i++) {

		if (ipv6_addr_cmp(&tp->md5sig_info->keys6[i].addr, peer) == 0) {

			/* Free the key */

			kfree(tp->md5sig_info->keys6[i].key);

			kfree(tp->md5sig_info->keys6[i].base.key);

			tp->md5sig_info->entries6--;



			if (tp->md5sig_info->entries6 == 0) {
@@ -657,7 +657,7 @@ static void tcp_v6_clear_md5_list (struct sock *sk) 


	if (tp->md5sig_info->entries6) {

		for (i = 0; i < tp->md5sig_info->entries6; i++)

			kfree(tp->md5sig_info->keys6[i].key);

			kfree(tp->md5sig_info->keys6[i].base.key);

		tp->md5sig_info->entries6 = 0;

		tcp_free_md5sig_pool();

	}
@@ -668,7 +668,7 @@ static void tcp_v6_clear_md5_list (struct sock *sk) 


	if (tp->md5sig_info->entries4) {

		for (i = 0; i < tp->md5sig_info->entries4; i++)

			kfree(tp->md5sig_info->keys4[i].key);

			kfree(tp->md5sig_info->keys4[i].base.key);

		tp->md5sig_info->entries4 = 0;

		tcp_free_md5sig_pool();

	}

net/socket.c

+0 −3
Original line number Diff line number Diff line
@@ -777,9 +777,6 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov, 
	if (pos != 0)

		return -ESPIPE;



	if (iocb->ki_left == 0)	/* Match SYS5 behaviour */

		return 0;



	x = alloc_sock_iocb(iocb, &siocb);

	if (!x)

		return -ENOMEM;