diff options
| author | kn <kn@cvs.openbsd.org> | 2018-07-11 18:06:26 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2018-07-11 18:06:26 +0000 |
| commit | e845cef21eb24390ed17412c4ee580016cbd6d8e (patch) | |
| tree | 6d5a3a049a25fb9a472acc18bd779879c061c26d /sbin/pfctl/parse.y | |
| parent | 4825185acc5f6b7cadef1e01ec0ea1de58c31ddc (diff) | |
Prevent invalid interface specifiers on queue rules
pf.conf(5) states that queues attach to actual interfaces only, yet the
following parses:
# echo queue eq on egress bandwidth 1G default | pfctl -f-
# pfctl -sq
pfctl: DIOCGETQSTATS: Bad file descriptor
# echo queue rq on rdomain 0 bandwidth 1G default | pfctl -vf-
queue rq bandwidth 1G default
# pfctl -sq
pfctl: DIOCGETQSTATS: Bad file descriptor
On rdomains, ifa_exists() returns NULL.
On interface groups, ifa_exists() returns non-NULL but af is never set
to AF_LINK.
OK henning sashan
Diffstat (limited to 'sbin/pfctl/parse.y')
| -rw-r--r-- | sbin/pfctl/parse.y | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 0dfe9c67c86..949613f0e2a 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.679 2018/07/11 07:39:22 krw Exp $ */ +/* $OpenBSD: parse.y,v 1.680 2018/07/11 18:06:25 kn Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -1326,12 +1326,20 @@ table_host_list : tablespec optnl { $$ = $1; } } ; -queuespec : QUEUE STRING interface queue_opts { - if ($3 == NULL && $4.parent == NULL) { +queuespec : QUEUE STRING ON if_item queue_opts { + struct node_host *n; + + if ($4 == NULL && $5.parent == NULL) { yyerror("root queue without interface"); YYERROR; } - expand_queue($2, $3, &$4); + if ((n = ifa_exists($4->ifname)) == NULL || + n->af != AF_LINK) { + yyerror("not an interface"); + YYERROR; + } + + expand_queue($2, $4, &$5); } ; |