aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@gnu.org>2000-03-30 08:41:04 +0800
committerMiguel de Icaza <miguel@src.gnome.org>2000-03-30 08:41:04 +0800
commit88674ff4013f5b62ecaeaf8021b8f710067b8598 (patch)
tree1065e5dc14e1271285aafd450795222db75e76c6 /camel
parent4435a5db63161145af807bc7e0845a899adeca30 (diff)
downloadgsoc2013-evolution-88674ff4013f5b62ecaeaf8021b8f710067b8598.tar
gsoc2013-evolution-88674ff4013f5b62ecaeaf8021b8f710067b8598.tar.gz
gsoc2013-evolution-88674ff4013f5b62ecaeaf8021b8f710067b8598.tar.bz2
gsoc2013-evolution-88674ff4013f5b62ecaeaf8021b8f710067b8598.tar.lz
gsoc2013-evolution-88674ff4013f5b62ecaeaf8021b8f710067b8598.tar.xz
gsoc2013-evolution-88674ff4013f5b62ecaeaf8021b8f710067b8598.tar.zst
gsoc2013-evolution-88674ff4013f5b62ecaeaf8021b8f710067b8598.zip
Add htons (port), and only copy 4 bytes for the IP address to prevent a
2000-03-29 Miguel de Icaza <miguel@gnu.org> * providers/pop3/camel-pop3-store.c (pop3_connect): Add htons (port), and only copy 4 bytes for the IP address to prevent a DNS attack. svn path=/trunk/; revision=2251
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/providers/pop3/camel-pop3-store.c9
2 files changed, 13 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index f04c228db4..4cc6e9d281 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-29 Miguel de Icaza <miguel@gnu.org>
+
+ * providers/pop3/camel-pop3-store.c (pop3_connect): Add htons
+ (port), and only copy 4 bytes for the IP address to prevent a DNS
+ attack.
+
2000-03-28 Dan Winship <danw@helixcode.com>
* camel-seekable-substream.c
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 543a6ce532..b41c27b0aa 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -233,8 +233,13 @@ pop3_connect (CamelService *service, CamelException *ex)
}
sin.sin_family = h->h_addrtype;
- sin.sin_port = port;
- memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
+ sin.sin_port = htons (port);
+
+ /*
+ * We copy only 4 bytes, as we can not trust h->h_length, as it
+ * comes from the DNS and might have been tampered with.
+ */
+ memcpy (&sin.sin_addr, h->h_addr, 4);
fd = socket (h->h_addrtype, SOCK_STREAM, 0);
if (fd == -1 ||