diff options
author | itojun <> | 2002-08-28 03:19:38 +0000 |
---|---|---|
committer | itojun <> | 2002-08-28 03:19:38 +0000 |
commit | 509a5b94525f34212cd48bccbf85481897ecd99f (patch) | |
tree | ad4ca3d9d137a32ab494b9859973ff1051cffb8b | |
parent | 69e635aa5ff8682829c1dabe85f07036fe78a8d8 (diff) | |
download | openbsd-509a5b94525f34212cd48bccbf85481897ecd99f.tar.gz openbsd-509a5b94525f34212cd48bccbf85481897ecd99f.tar.bz2 openbsd-509a5b94525f34212cd48bccbf85481897ecd99f.zip |
Limit UDP payload size for EDNS0 to 0xffff, not use lower 16bit value.
from onoe@sm.sony.co.jp
-rw-r--r-- | src/lib/libc/net/res_mkquery.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libc/net/res_mkquery.c b/src/lib/libc/net/res_mkquery.c index 6e57ec3217..6cd6a00dbe 100644 --- a/src/lib/libc/net/res_mkquery.c +++ b/src/lib/libc/net/res_mkquery.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: res_mkquery.c,v 1.11 2002/06/26 06:01:16 itojun Exp $ */ | 1 | /* $OpenBSD: res_mkquery.c,v 1.12 2002/08/28 03:19:38 itojun Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * ++Copyright++ 1985, 1993 | 4 | * ++Copyright++ 1985, 1993 |
@@ -60,7 +60,7 @@ | |||
60 | static char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93"; | 60 | static char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93"; |
61 | static char rcsid[] = "$From: res_mkquery.c,v 8.5 1996/08/27 08:33:28 vixie Exp $"; | 61 | static char rcsid[] = "$From: res_mkquery.c,v 8.5 1996/08/27 08:33:28 vixie Exp $"; |
62 | #else | 62 | #else |
63 | static char rcsid[] = "$OpenBSD: res_mkquery.c,v 1.11 2002/06/26 06:01:16 itojun Exp $"; | 63 | static char rcsid[] = "$OpenBSD: res_mkquery.c,v 1.12 2002/08/28 03:19:38 itojun Exp $"; |
64 | #endif | 64 | #endif |
65 | #endif /* LIBC_SCCS and not lint */ | 65 | #endif /* LIBC_SCCS and not lint */ |
66 | 66 | ||
@@ -217,6 +217,8 @@ res_opt(n0, buf, buflen, anslen) | |||
217 | 217 | ||
218 | __putshort(T_OPT, cp); /* TYPE */ | 218 | __putshort(T_OPT, cp); /* TYPE */ |
219 | cp += INT16SZ; | 219 | cp += INT16SZ; |
220 | if (anslen > 0xffff) | ||
221 | anslen = 0xffff; /* limit to 16bit value */ | ||
220 | __putshort(anslen & 0xffff, cp); /* CLASS = UDP payload size */ | 222 | __putshort(anslen & 0xffff, cp); /* CLASS = UDP payload size */ |
221 | cp += INT16SZ; | 223 | cp += INT16SZ; |
222 | *cp++ = NOERROR; /* extended RCODE */ | 224 | *cp++ = NOERROR; /* extended RCODE */ |