diff options
| author | Renato Westphal <renato@cvs.openbsd.org> | 2015-07-21 04:56:45 +0000 |
|---|---|---|
| committer | Renato Westphal <renato@cvs.openbsd.org> | 2015-07-21 04:56:45 +0000 |
| commit | 71810531f827424a9421701aae70f0168001e4cd (patch) | |
| tree | e6f9613deaa194ccad6e42cdf0410b80dc380fd8 | |
| parent | 9424b5c97ed98d02ec9e118db160d1f38d815192 (diff) | |
Validate ip addresses on configuration.
ok claudio@
| -rw-r--r-- | usr.sbin/ldpd/parse.y | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/usr.sbin/ldpd/parse.y b/usr.sbin/ldpd/parse.y index cb4f73af7c9..c148934f203 100644 --- a/usr.sbin/ldpd/parse.y +++ b/usr.sbin/ldpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.29 2015/07/21 04:52:29 renato Exp $ */ +/* $OpenBSD: parse.y,v 1.30 2015/07/21 04:56:44 renato Exp $ */ /* * Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org> @@ -106,6 +106,8 @@ struct config_defaults tnbrdefs; struct config_defaults pwdefs; struct config_defaults *defs; +int bad_ip_addr(struct in_addr); + struct iface *conf_get_if(struct kif *); struct tnbr *conf_get_tnbr(struct in_addr); struct nbr_params *conf_get_nbrp(struct in_addr); @@ -196,6 +198,10 @@ conf_main : ROUTERID STRING { YYERROR; } free($2); + if (bad_ip_addr(conf->rtr_id)) { + yyerror("invalid router-id"); + YYERROR; + } } | FIBUPDATE yesno { if ($2 == 0) @@ -520,6 +526,10 @@ tneighbor : TNEIGHBOR STRING { YYERROR; } free($2); + if (bad_ip_addr(addr)) { + yyerror("invalid neighbor address"); + YYERROR; + } tnbr = conf_get_tnbr(addr); if (tnbr == NULL) @@ -558,6 +568,10 @@ neighbor : NEIGHBOR STRING { YYERROR; } free($2); + if (bad_ip_addr(addr)) { + yyerror("invalid neighbor address"); + YYERROR; + } nbrp = conf_get_nbrp(addr); if (nbrp == NULL) @@ -1116,6 +1130,16 @@ symget(const char *nam) return (NULL); } +int +bad_ip_addr(struct in_addr addr) +{ + u_int32_t a = ntohl(addr.s_addr); + + return (((a >> IN_CLASSA_NSHIFT) == 0) + || ((a >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) + || IN_MULTICAST(a) || IN_BADCLASS(a)); +} + struct iface * conf_get_if(struct kif *kif) { |