[src/trunk]: src/external/bsd/blacklist/bin sanity checks for the received so...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7f540546a332
branches:  trunk
changeset: 335756:7f540546a332
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 22 23:45:41 2015 +0000

description:
sanity checks for the received socket.

diffstat:

 external/bsd/blacklist/bin/blacklistd.c |  31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 327743424b79 -r 7f540546a332 external/bsd/blacklist/bin/blacklistd.c
--- a/external/bsd/blacklist/bin/blacklistd.c   Thu Jan 22 23:26:42 2015 +0000
+++ b/external/bsd/blacklist/bin/blacklistd.c   Thu Jan 22 23:45:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: blacklistd.c,v 1.24 2015/01/22 23:20:28 christos Exp $ */
+/*     $NetBSD: blacklistd.c,v 1.25 2015/01/22 23:45:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: blacklistd.c,v 1.24 2015/01/22 23:20:28 christos Exp $");
+__RCSID("$NetBSD: blacklistd.c,v 1.25 2015/01/22 23:45:41 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -58,6 +58,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
+#include <netinet/in.h>
 
 #include "bl.h"
 #include "internal.h"
@@ -150,6 +151,32 @@
                        goto out;
                }
                memcpy(&rss, &bi->bi_ss, bi->bi_slen);
+               switch (rss.ss_family) {
+               case AF_INET:
+                       rsl = sizeof(struct sockaddr_in);
+                       break;
+               case AF_INET6:
+                       rsl = sizeof(struct sockaddr_in6);
+                       break;
+               default:
+                       (*lfun)(LOG_ERR, "bad client passed socket family %u",
+                           rss.ss_family); 
+                       goto out;
+               }
+               if (rsl != bi->bi_slen) {
+                   (*lfun)(LOG_ERR,
+                       "bad client passed socket length %u != %u",
+                       (unsigned)rsl, bi->bi_slen); 
+                   goto out;
+               }
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+               if (rsl != rss.ss_len) {
+                   (*lfun)(LOG_ERR,
+                       "bad client passed socket internal length %u != %u",
+                       (unsigned)rsl, rss.ss_len, rsl); 
+                   goto out;
+               }
+#endif
        }
        if (state_get(state, &rss, &c, &dbi) == -1)
                goto out;