From f051cbcb714806d76f3676c3cf04566464d3d1e2 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Tue, 20 Nov 2007 17:30:31 -0800
Subject: [PATCH] --- yaml --- r: 74211 b: refs/heads/master c:
 354faf0977397cea382e9e9c214fd028377d277b h: refs/heads/master i:   74209:
 d060eab2859b12d27ffb80ec96b42478bc53d85b   74207:
 d1dba69f1e7f6a7196eca3075dc371b9fb393c30 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_ipv4.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b7f215866587..775349a05161 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a80cc20da492d9a00b0851a6632dc03fed5d2e30
+refs/heads/master: 354faf0977397cea382e9e9c214fd028377d277b
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index ff360968b910..652c32368ccc 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/net/ipv4/tcp_ipv4.c
@@ -938,10 +938,10 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
 				tp->md5sig_info->alloced4 = 0;
 			} else if (tp->md5sig_info->entries4 != i) {
 				/* Need to do some manipulation */
-				memcpy(&tp->md5sig_info->keys4[i],
-				       &tp->md5sig_info->keys4[i+1],
-				       (tp->md5sig_info->entries4 - i) *
-					sizeof(struct tcp4_md5sig_key));
+				memmove(&tp->md5sig_info->keys4[i],
+					&tp->md5sig_info->keys4[i+1],
+					(tp->md5sig_info->entries4 - i) *
+					 sizeof(struct tcp4_md5sig_key));
 			}
 			tcp_free_md5sig_pool();
 			return 0;