diff options
| author |   dtucker <dtucker@openbsd.org> | 2014-01-19 11:21:51 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2014-01-19 11:21:51 +0000 |
| commit | 55496404692557d54d269ba4c72b45eb07bb38a4 (patch) | |
| tree | 252f6ee692f9e61b7a6eaa42c356082f8c51decc /usr.bin/ssh/addrmatch.c | |
| parent | RTF_MPATH is a flag userland needs to be able to pass in since it is used (diff) | |
| download | wireguard-openbsd-55496404692557d54d269ba4c72b45eb07bb38a4.tar.xz wireguard-openbsd-55496404692557d54d269ba4c72b45eb07bb38a4.zip | |
Cast the sizeof to socklen_t so it'll work even if the supplied len is
negative. Suggested by and ok djm, ok deraadt.
Diffstat (limited to 'usr.bin/ssh/addrmatch.c')
| -rw-r--r-- | usr.bin/ssh/addrmatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/addrmatch.c b/usr.bin/ssh/addrmatch.c index fbd858c2d34..4e8f98acb1b 100644 --- a/usr.bin/ssh/addrmatch.c +++ b/usr.bin/ssh/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.8 2014/01/19 04:17:29 dtucker Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.9 2014/01/19 11:21:51 dtucker Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> @@ -86,13 +86,13 @@ addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa) switch (sa->sa_family) { case AF_INET: - if ((size_t)slen < sizeof(*in4)) + if (slen < (socklen_t)sizeof(*in4)) return -1; xa->af = AF_INET; memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4)); break; case AF_INET6: - if ((size_t)slen < sizeof(*in6)) + if (slen < (socklen_t)sizeof(*in6)) return -1; xa->af = AF_INET6; memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6)); |