Page MenuHomeFreeBSD
Differential D29557 Diff 86887 sys/netpfil/pf/pf_ioctl.c

Changeset View

Standalone View

View Options

sys/netpfil/pf/pf_ioctl.c

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Lines
#include <sys/hash.h> #include <sys/hash.h>
#include <sys/interrupt.h> #include <sys/interrupt.h>
#include <sys/jail.h> #include <sys/jail.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/kthread.h> #include <sys/kthread.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/mbuf.h> #include <sys/mbuf.h>
#include <sys/module.h> #include <sys/module.h>
#include <sys/nv.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/smp.h> #include <sys/smp.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/md5.h> #include <sys/md5.h>
#include <sys/ucred.h> #include <sys/ucred.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_var.h> #include <net/if_var.h>
#include <net/vnet.h> #include <net/vnet.h>
#include <net/route.h> #include <net/route.h>
#include <net/pfil.h> #include <net/pfil.h>
#include <net/pfvar.h> #include <net/pfvar.h>
#include <net/if_pfsync.h> #include <net/if_pfsync.h>
#include <net/if_pflog.h> #include <net/if_pflog.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip_var.h> #include <netinet/ip_var.h>
#include <netinet6/ip6_var.h> #include <netinet6/ip6_var.h>
#include <netinet/ip_icmp.h> #include <netinet/ip_icmp.h>
#include <netpfil/pf/pf_nv.h>
#ifdef INET6 #ifdef INET6
#include <netinet/ip6.h> #include <netinet/ip6.h>
#endif /* INET6 */ #endif /* INET6 */
#ifdef ALTQ #ifdef ALTQ
#include <net/altq/altq.h> #include <net/altq/altq.h>
#endif #endif
static struct pf_kpool *pf_get_kpool(char *, u_int32_t, u_int8_t, u_int32_t, static struct pf_kpool *pf_get_kpool(char *, u_int32_t, u_int8_t, u_int32_t,
markjUnsubmitted
Not Done
Inline Actions

Why not include it via a system path?

markj: Why not include it via a system path?
u_int8_t, u_int8_t, u_int8_t); u_int8_t, u_int8_t, u_int8_t);
static void pf_mv_kpool(struct pf_kpalist *, struct pf_kpalist *); static void pf_mv_kpool(struct pf_kpalist *, struct pf_kpalist *);
static void pf_empty_kpool(struct pf_kpalist *); static void pf_empty_kpool(struct pf_kpalist *);
static int pfioctl(struct cdev *, u_long, caddr_t, int, static int pfioctl(struct cdev *, u_long, caddr_t, int,
struct thread *); struct thread *);
#ifdef ALTQ #ifdef ALTQ
static int pf_begin_altq(u_int32_t *); static int pf_begin_altq(u_int32_t *);
▲ Show 20 Lines • Show All 1,516 Lines • ▼ Show 20 Linespf_check_rule_addr(const struct pf_rule_addr *addr)
if (addr->addr.p.dyn != NULL) { if (addr->addr.p.dyn != NULL) {
return (EINVAL); return (EINVAL);
} }
return (0); return (0);
} }
static int static int
pf_nvaddr_to_addr(const nvlist_t *nvl, struct pf_addr *paddr)
{
return (pf_nvbinary(nvl, "addr", paddr, sizeof(*paddr)));
markjUnsubmitted
Not Done
Inline Actions

They're equivalent, but it looks like the last parameter should be sizeof(*paddr).

markj: They're equivalent, but it looks like the last parameter should be `sizeof(*paddr)`.
}
static int
pf_nvpool_to_pool(const nvlist_t *nvl, struct pf_kpool *kpool)
{
int error = 0;
bzero(kpool, sizeof(*kpool));
PFNV_CHK(pf_nvbinary(nvl, "key", &kpool->key, sizeof(kpool->key)));
if (nvlist_exists_nvlist(nvl, "counter")) {
PFNV_CHK(pf_nvaddr_to_addr(nvlist_get_nvlist(nvl, "counter"),
&kpool->counter));
}
PFNV_CHK(pf_nvint(nvl, "tblidx", &kpool->tblidx));
PFNV_CHK(pf_nvuint16_array(nvl, "proxy_port", kpool->proxy_port, 2,
NULL));
PFNV_CHK(pf_nvuint8(nvl, "opts", &kpool->opts));
errout:
return (error);
}
static int
pf_nvaddr_wrap_to_addr_wrap(const nvlist_t *nvl, struct pf_addr_wrap *addr)
{
int error = 0;
bzero(addr, sizeof(*addr));
PFNV_CHK(pf_nvuint8(nvl, "type", &addr->type));
PFNV_CHK(pf_nvuint8(nvl, "iflags", &addr->iflags));
PFNV_CHK(pf_nvstring(nvl, "ifname", addr->v.ifname,
sizeof(addr->v.ifname)));
PFNV_CHK(pf_nvstring(nvl, "tblname", addr->v.tblname,
sizeof(addr->v.tblname)));
if (! nvlist_exists_nvlist(nvl, "addr"))
return (EINVAL);
PFNV_CHK(pf_nvaddr_to_addr(nvlist_get_nvlist(nvl, "addr"),
&addr->v.a.addr));
if (! nvlist_exists_nvlist(nvl, "mask"))
return (EINVAL);
PFNV_CHK(pf_nvaddr_to_addr(nvlist_get_nvlist(nvl, "mask"),
&addr->v.a.mask));
switch (addr->type) {
case PF_ADDR_DYNIFTL:
case PF_ADDR_TABLE:
case PF_ADDR_RANGE:
case PF_ADDR_ADDRMASK:
case PF_ADDR_NOROUTE:
case PF_ADDR_URPFFAILED:
break;
default:
return (EINVAL);
}
errout:
return (error);
}
static int
pf_validate_op(uint8_t op)
glebiusUnsubmitted
Not Done
Inline Actions

Better use uint8_t in the new code.

glebius: Better use uint8_t in the new code.
{
switch (op) {
case PF_OP_NONE:
case PF_OP_IRG:
case PF_OP_EQ:
case PF_OP_NE:
case PF_OP_LT:
case PF_OP_LE:
case PF_OP_GT:
case PF_OP_GE:
case PF_OP_XRG:
case PF_OP_RRG:
break;
default:
return (EINVAL);
}
return (0);
}
static int
pf_nvrule_addr_to_rule_addr(const nvlist_t *nvl, struct pf_rule_addr *addr)
{
int error = 0;
if (! nvlist_exists_nvlist(nvl, "addr"))
return (EINVAL);
PFNV_CHK(pf_nvaddr_wrap_to_addr_wrap(nvlist_get_nvlist(nvl, "addr"),
&addr->addr));
PFNV_CHK(pf_nvuint16_array(nvl, "port", addr->port, 2, NULL));
markjUnsubmitted
Not Done
Inline Actions

I think there's nothing checking that the supplied array has exactly two elements. Should the checking be more strict, so that an array of length 1 is rejected? There are a few examples of this.

markj: I think there's nothing checking that the supplied array has exactly two elements. Should the…
PFNV_CHK(pf_nvuint8(nvl, "neg", &addr->neg));
PFNV_CHK(pf_nvuint8(nvl, "port_op", &addr->port_op));
PFNV_CHK(pf_validate_op(addr->port_op));
errout:
return (error);
}
static int
pf_nvrule_uid_to_rule_uid(const nvlist_t *nvl, struct pf_rule_uid *uid)
{
int error = 0;
bzero(uid, sizeof(*uid));
PFNV_CHK(pf_nvuint32_array(nvl, "uid", uid->uid, 2, NULL));
PFNV_CHK(pf_nvuint8(nvl, "op", &uid->op));
PFNV_CHK(pf_validate_op(uid->op));
errout:
return (error);
}
static int
pf_nvrule_gid_to_rule_gid(const nvlist_t *nvl, struct pf_rule_gid *gid)
{
/* Cheat a little. These stucts are the same, other than the name of
* the first field. */
return (pf_nvrule_uid_to_rule_uid(nvl, (struct pf_rule_uid *)gid));
}
static int
pf_nvrule_to_krule(const nvlist_t *nvl, struct pf_krule **prule)
{
struct pf_krule *rule;
int error = 0;
rule = malloc(sizeof(*rule), M_PFRULE, M_WAITOK | M_ZERO);
PFNV_CHK(pf_nvuint32(nvl, "nr", &rule->nr));
if (! nvlist_exists_nvlist(nvl, "src")) {
error = EINVAL;
goto errout;
}
error = pf_nvrule_addr_to_rule_addr(nvlist_get_nvlist(nvl, "src"),
&rule->src);
if (error != 0)
goto errout;
if (! nvlist_exists_nvlist(nvl, "dst")) {
error = EINVAL;
goto errout;
}
PFNV_CHK(pf_nvrule_addr_to_rule_addr(nvlist_get_nvlist(nvl, "dst"),
&rule->dst));
PFNV_CHK(pf_nvstring(nvl, "label", rule->label, sizeof(rule->label)));
PFNV_CHK(pf_nvstring(nvl, "ifname", rule->ifname,
sizeof(rule->ifname)));
PFNV_CHK(pf_nvstring(nvl, "qname", rule->qname, sizeof(rule->qname)));
PFNV_CHK(pf_nvstring(nvl, "pqname", rule->pqname,
sizeof(rule->pqname)));
PFNV_CHK(pf_nvstring(nvl, "tagname", rule->tagname,
sizeof(rule->tagname)));
PFNV_CHK(pf_nvstring(nvl, "match_tagname", rule->match_tagname,
sizeof(rule->match_tagname)));
PFNV_CHK(pf_nvstring(nvl, "overload_tblname", rule->overload_tblname,
sizeof(rule->overload_tblname)));
if (! nvlist_exists_nvlist(nvl, "rpool")) {
error = EINVAL;
glebiusUnsubmitted
Not Done
Inline Actions

Don't we leak rule here?

glebius: Don't we leak rule here?
goto errout;
}
PFNV_CHK(pf_nvpool_to_pool(nvlist_get_nvlist(nvl, "rpool"),
&rule->rpool));
PFNV_CHK(pf_nvuint32(nvl, "os_fingerprint", &rule->os_fingerprint));
PFNV_CHK(pf_nvint(nvl, "rtableid", &rule->rtableid));
PFNV_CHK(pf_nvuint32_array(nvl, "timeout", rule->timeout, PFTM_MAX, NULL));
PFNV_CHK(pf_nvuint32(nvl, "max_states", &rule->max_states));
PFNV_CHK(pf_nvuint32(nvl, "max_src_nodes", &rule->max_src_nodes));
PFNV_CHK(pf_nvuint32(nvl, "max_src_states", &rule->max_src_states));
PFNV_CHK(pf_nvuint32(nvl, "max_src_conn", &rule->max_src_conn));
PFNV_CHK(pf_nvuint32(nvl, "max_src_conn_rate.limit",
&rule->max_src_conn_rate.limit));
PFNV_CHK(pf_nvuint32(nvl, "max_src_conn_rate.seconds",
&rule->max_src_conn_rate.seconds));
PFNV_CHK(pf_nvuint32(nvl, "rt_listid", &rule->rt_listid));
PFNV_CHK(pf_nvuint32(nvl, "prob", &rule->prob));
PFNV_CHK(pf_nvuint32(nvl, "cuid", &rule->cuid));
PFNV_CHK(pf_nvuint32(nvl, "cpid", &rule->cpid));
PFNV_CHK(pf_nvuint16(nvl, "return_icmp", &rule->return_icmp));
PFNV_CHK(pf_nvuint16(nvl, "return_icmp6", &rule->return_icmp6));
PFNV_CHK(pf_nvuint16(nvl, "max_mss", &rule->max_mss));
PFNV_CHK(pf_nvuint16(nvl, "scrub_flags", &rule->scrub_flags));
if (! nvlist_exists_nvlist(nvl, "uid")) {
error = EINVAL;
goto errout;
}
PFNV_CHK(pf_nvrule_uid_to_rule_uid(nvlist_get_nvlist(nvl, "uid"),
&rule->uid));
if (! nvlist_exists_nvlist(nvl, "gid")) {
error = EINVAL;
goto errout;
}
PFNV_CHK(pf_nvrule_gid_to_rule_gid(nvlist_get_nvlist(nvl, "gid"),
&rule->gid));
PFNV_CHK(pf_nvuint32(nvl, "rule_flag", &rule->rule_flag));
PFNV_CHK(pf_nvuint8(nvl, "action", &rule->action));
PFNV_CHK(pf_nvuint8(nvl, "direction", &rule->direction));
PFNV_CHK(pf_nvuint8(nvl, "log", &rule->log));
PFNV_CHK(pf_nvuint8(nvl, "logif", &rule->logif));
PFNV_CHK(pf_nvuint8(nvl, "quick", &rule->quick));
PFNV_CHK(pf_nvuint8(nvl, "ifnot", &rule->ifnot));
PFNV_CHK(pf_nvuint8(nvl, "match_tag_not", &rule->match_tag_not));
PFNV_CHK(pf_nvuint8(nvl, "natpass", &rule->natpass));
PFNV_CHK(pf_nvuint8(nvl, "keep_state", &rule->keep_state));
PFNV_CHK(pf_nvuint8(nvl, "af", &rule->af));
PFNV_CHK(pf_nvuint8(nvl, "proto", &rule->proto));
PFNV_CHK(pf_nvuint8(nvl, "type", &rule->type));
PFNV_CHK(pf_nvuint8(nvl, "code", &rule->code));
PFNV_CHK(pf_nvuint8(nvl, "flags", &rule->flags));
PFNV_CHK(pf_nvuint8(nvl, "flagset", &rule->flagset));
PFNV_CHK(pf_nvuint8(nvl, "min_ttl", &rule->min_ttl));
PFNV_CHK(pf_nvuint8(nvl, "allow_opts", &rule->allow_opts));
PFNV_CHK(pf_nvuint8(nvl, "rt", &rule->rt));
PFNV_CHK(pf_nvuint8(nvl, "return_ttl", &rule->return_ttl));
PFNV_CHK(pf_nvuint8(nvl, "tos", &rule->tos));
PFNV_CHK(pf_nvuint8(nvl, "set_tos", &rule->set_tos));
PFNV_CHK(pf_nvuint8(nvl, "anchor_relative", &rule->anchor_relative));
PFNV_CHK(pf_nvuint8(nvl, "anchor_wildcard", &rule->anchor_wildcard));
PFNV_CHK(pf_nvuint8(nvl, "flush", &rule->flush));
PFNV_CHK(pf_nvuint8(nvl, "prio", &rule->prio));
PFNV_CHK(pf_nvuint8_array(nvl, "set_prio", &rule->prio, 2, NULL));
if (nvlist_exists_nvlist(nvl, "divert")) {
const nvlist_t *nvldivert = nvlist_get_nvlist(nvl, "divert");
if (! nvlist_exists_nvlist(nvldivert, "addr")) {
error = EINVAL;
goto errout;
}
PFNV_CHK(pf_nvaddr_to_addr(nvlist_get_nvlist(nvldivert, "addr"),
&rule->divert.addr));
PFNV_CHK(pf_nvuint16(nvldivert, "port", &rule->divert.port));
}
/* Validation */
#ifndef INET
if (rule->af == AF_INET) {
error = EAFNOSUPPORT;
goto errout;
}
#endif /* INET */
#ifndef INET6
if (rule->af == AF_INET6) {
error = EAFNOSUPPORT;
goto errout;
}
#endif /* INET6 */
PFNV_CHK(pf_check_rule_addr(&rule->src));
PFNV_CHK(pf_check_rule_addr(&rule->dst));
*prule = rule;
return (0);
errout:
pf_krule_free(rule);
*prule = NULL;
return (error);
}
static int
pf_rule_to_krule(const struct pf_rule *rule, struct pf_krule *krule) pf_rule_to_krule(const struct pf_rule *rule, struct pf_krule *krule)
{ {
int ret; int ret;
#ifndef INET #ifndef INET
if (rule->af == AF_INET) { if (rule->af == AF_INET) {
return (EAFNOSUPPORT); return (EAFNOSUPPORT);
} }
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Lines#endif /* INET6 */
krule->set_prio[1] = rule->set_prio[1]; krule->set_prio[1] = rule->set_prio[1];
bcopy(&rule->divert, &krule->divert, sizeof(krule->divert)); bcopy(&rule->divert, &krule->divert, sizeof(krule->divert));
return (0); return (0);
} }
static int static int
pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket,
uint32_t pool_ticket, const char *anchor, const char *anchor_call,
glebiusUnsubmitted
Not Done
Inline Actions

Better use uint32_t in new code. More of this applies to new files pf_nv.h and pf_nv.c

glebius: Better use uint32_t in new code. More of this applies to new files pf_nv.h and pf_nv.c
struct thread *td)
{
struct pf_kruleset *ruleset;
struct pf_krule *tail;
struct pf_kpooladdr *pa;
struct pfi_kkif *kif = NULL;
int rs_num;
int error = 0;
if ((rule->return_icmp >> 8) > ICMP_MAXTYPE) {
error = EINVAL;
goto errout_unlocked;
}
#define ERROUT(x) { error = (x); goto errout; }
if (rule->ifname[0])
kif = pf_kkif_create(M_WAITOK);
rule->evaluations = counter_u64_alloc(M_WAITOK);
for (int i = 0; i < 2; i++) {
rule->packets[i] = counter_u64_alloc(M_WAITOK);
rule->bytes[i] = counter_u64_alloc(M_WAITOK);
}
rule->states_cur = counter_u64_alloc(M_WAITOK);
rule->states_tot = counter_u64_alloc(M_WAITOK);
rule->src_nodes = counter_u64_alloc(M_WAITOK);
rule->cuid = td->td_ucred->cr_ruid;
rule->cpid = td->td_proc ? td->td_proc->p_pid : 0;
TAILQ_INIT(&rule->rpool.list);
PF_RULES_WLOCK();
ruleset = pf_find_kruleset(anchor);
if (ruleset == NULL)
ERROUT(EINVAL);
rs_num = pf_get_ruleset_number(rule->action);
if (rs_num >= PF_RULESET_MAX)
ERROUT(EINVAL);
if (ticket != ruleset->rules[rs_num].inactive.ticket) {
DPFPRINTF(PF_DEBUG_MISC,
("ticket: %d != [%d]%d\n", ticket, rs_num,
ruleset->rules[rs_num].inactive.ticket));
ERROUT(EBUSY);
}
if (pool_ticket != V_ticket_pabuf) {
DPFPRINTF(PF_DEBUG_MISC,
("pool_ticket: %d != %d\n", pool_ticket,
V_ticket_pabuf));
ERROUT(EBUSY);
}
tail = TAILQ_LAST(ruleset->rules[rs_num].inactive.ptr,
pf_krulequeue);
if (tail)
rule->nr = tail->nr + 1;
else
rule->nr = 0;
if (rule->ifname[0]) {
rule->kif = pfi_kkif_attach(kif, rule->ifname);
pfi_kkif_ref(rule->kif);
} else
rule->kif = NULL;
if (rule->rtableid > 0 && rule->rtableid >= rt_numfibs)
error = EBUSY;
#ifdef ALTQ
/* set queue IDs */
if (rule->qname[0] != 0) {
if ((rule->qid = pf_qname2qid(rule->qname)) == 0)
error = EBUSY;
else if (rule->pqname[0] != 0) {
if ((rule->pqid =
pf_qname2qid(rule->pqname)) == 0)
error = EBUSY;
} else
rule->pqid = rule->qid;
}
#endif
if (rule->tagname[0])
if ((rule->tag = pf_tagname2tag(rule->tagname)) == 0)
error = EBUSY;
if (rule->match_tagname[0])
if ((rule->match_tag =
pf_tagname2tag(rule->match_tagname)) == 0)
error = EBUSY;
if (rule->rt && !rule->direction)
error = EINVAL;
if (!rule->log)
rule->logif = 0;
if (rule->logif >= PFLOGIFS_MAX)
error = EINVAL;
if (pf_addr_setup(ruleset, &rule->src.addr, rule->af))
error = ENOMEM;
if (pf_addr_setup(ruleset, &rule->dst.addr, rule->af))
error = ENOMEM;
if (pf_kanchor_setup(rule, ruleset, anchor_call))
error = EINVAL;
if (rule->scrub_flags & PFSTATE_SETPRIO &&
(rule->set_prio[0] > PF_PRIO_MAX ||
rule->set_prio[1] > PF_PRIO_MAX))
error = EINVAL;
TAILQ_FOREACH(pa, &V_pf_pabuf, entries)
if (pa->addr.type == PF_ADDR_TABLE) {
pa->addr.p.tbl = pfr_attach_table(ruleset,
pa->addr.v.tblname);
if (pa->addr.p.tbl == NULL)
error = ENOMEM;
}
rule->overload_tbl = NULL;
if (rule->overload_tblname[0]) {
if ((rule->overload_tbl = pfr_attach_table(ruleset,
rule->overload_tblname)) == NULL)
error = EINVAL;
else
rule->overload_tbl->pfrkt_flags |=
PFR_TFLAG_ACTIVE;
}
pf_mv_kpool(&V_pf_pabuf, &rule->rpool.list);
if (((((rule->action == PF_NAT) || (rule->action == PF_RDR) ||
(rule->action == PF_BINAT)) && rule->anchor == NULL) ||
(rule->rt > PF_NOPFROUTE)) &&
(TAILQ_FIRST(&rule->rpool.list) == NULL))
error = EINVAL;
if (error) {
pf_free_rule(rule);
rule = NULL;
ERROUT(error);
}
rule->rpool.cur = TAILQ_FIRST(&rule->rpool.list);
counter_u64_zero(rule->evaluations);
for (int i = 0; i < 2; i++) {
counter_u64_zero(rule->packets[i]);
counter_u64_zero(rule->bytes[i]);
}
TAILQ_INSERT_TAIL(ruleset->rules[rs_num].inactive.ptr,
rule, entries);
ruleset->rules[rs_num].inactive.rcount++;
PF_RULES_WUNLOCK();
return (0);
#undef ERROUT
errout:
PF_RULES_WUNLOCK();
errout_unlocked:
pf_kkif_free(kif);
pf_krule_free(rule);
return (error);
}
static int
pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td) pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
{ {
int error = 0; int error = 0;
PF_RULES_RLOCK_TRACKER; PF_RULES_RLOCK_TRACKER;
/* XXX keep in sync with switch() below */ /* XXX keep in sync with switch() below */
if (securelevel_gt(td->td_ucred, 2)) if (securelevel_gt(td->td_ucred, 2))
switch (cmd) { switch (cmd) {
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Lines case DIOCSTOP:
else { else {
V_pf_status.running = 0; V_pf_status.running = 0;
dehook_pf(); dehook_pf();
V_pf_status.since = time_second; V_pf_status.since = time_second;
DPFPRINTF(PF_DEBUG_MISC, ("pf: stopped\n")); DPFPRINTF(PF_DEBUG_MISC, ("pf: stopped\n"));
} }
break; break;
case DIOCADDRULE: { case DIOCADDRULENV: {
struct pfioc_rule *pr = (struct pfioc_rule *)addr; struct pfioc_nv *nv = (struct pfioc_nv *)addr;
struct pf_kruleset *ruleset; nvlist_t *nvl = NULL;
struct pf_krule *rule, *tail; void *nvlpacked = NULL;
struct pf_kpooladdr *pa; struct pf_krule *rule = NULL;
struct pfi_kkif *kif = NULL; const char *anchor = "", *anchor_call = "";
int rs_num; uint32_t ticket = 0, pool_ticket = 0;
if (pr->rule.return_icmp >> 8 > ICMP_MAXTYPE) { #define ERROUT(x) do { error = (x); goto DIOCADDRULENV_error; } while (0)
error = EINVAL;
break;
}
rule = malloc(sizeof(*rule), M_PFRULE, M_WAITOK); if (nv->len > pf_ioctl_maxcount)
error = pf_rule_to_krule(&pr->rule, rule); ERROUT(ENOMEM);
if (error != 0) {
free(rule, M_PFRULE);
break;
}
if (rule->ifname[0]) nvlpacked = malloc(nv->len, M_TEMP, M_WAITOK);
kif = pf_kkif_create(M_WAITOK); error = copyin(nv->data, nvlpacked, nv->len);
rule->evaluations = counter_u64_alloc(M_WAITOK); if (error)
markjUnsubmitted
Not Done
Inline Actions

malloc(M_WAITOK) won't fail.

markj: malloc(M_WAITOK) won't fail.
for (int i = 0; i < 2; i++) { ERROUT(error);
rule->packets[i] = counter_u64_alloc(M_WAITOK);
rule->bytes[i] = counter_u64_alloc(M_WAITOK);
}
rule->states_cur = counter_u64_alloc(M_WAITOK);
rule->states_tot = counter_u64_alloc(M_WAITOK);
rule->src_nodes = counter_u64_alloc(M_WAITOK);
rule->cuid = td->td_ucred->cr_ruid;
rule->cpid = td->td_proc ? td->td_proc->p_pid : 0;
TAILQ_INIT(&rule->rpool.list);
#define ERROUT(x) { error = (x); goto DIOCADDRULE_error; }
PF_RULES_WLOCK(); nvl = nvlist_unpack(nvlpacked, nv->len, 0);
pr->anchor[sizeof(pr->anchor) - 1] = 0; if (nvl == NULL)
ruleset = pf_find_kruleset(pr->anchor); ERROUT(EBADMSG);
if (ruleset == NULL)
if (! nvlist_exists_number(nvl, "ticket"))
markjUnsubmitted
Not Done
Inline Actions

Do nvl and nvlpacked get freed anywhere?

markj: Do `nvl` and `nvlpacked` get freed anywhere?
ERROUT(EINVAL); ERROUT(EINVAL);
rs_num = pf_get_ruleset_number(pr->rule.action); ticket = nvlist_get_number(nvl, "ticket");
if (rs_num >= PF_RULESET_MAX)
if (! nvlist_exists_number(nvl, "pool_ticket"))
ERROUT(EINVAL); ERROUT(EINVAL);
if (pr->ticket != ruleset->rules[rs_num].inactive.ticket) { pool_ticket = nvlist_get_number(nvl, "pool_ticket");
DPFPRINTF(PF_DEBUG_MISC,
("ticket: %d != [%d]%d\n", pr->ticket, rs_num,
ruleset->rules[rs_num].inactive.ticket));
ERROUT(EBUSY);
}
if (pr->pool_ticket != V_ticket_pabuf) {
DPFPRINTF(PF_DEBUG_MISC,
("pool_ticket: %d != %d\n", pr->pool_ticket,
V_ticket_pabuf));
ERROUT(EBUSY);
}
tail = TAILQ_LAST(ruleset->rules[rs_num].inactive.ptr, if (! nvlist_exists_nvlist(nvl, "rule"))
pf_krulequeue); ERROUT(EINVAL);
if (tail)
rule->nr = tail->nr + 1;
else
rule->nr = 0;
if (rule->ifname[0]) {
rule->kif = pfi_kkif_attach(kif, rule->ifname);
pfi_kkif_ref(rule->kif);
} else
rule->kif = NULL;
if (rule->rtableid > 0 && rule->rtableid >= rt_numfibs) error = pf_nvrule_to_krule(nvlist_get_nvlist(nvl, "rule"),
error = EBUSY; &rule);
if (error)
ERROUT(error);
#ifdef ALTQ if (nvlist_exists_string(nvl, "anchor"))
/* set queue IDs */ anchor = nvlist_get_string(nvl, "anchor");
if (rule->qname[0] != 0) { if (nvlist_exists_string(nvl, "anchor_call"))
if ((rule->qid = pf_qname2qid(rule->qname)) == 0) anchor_call = nvlist_get_string(nvl, "anchor_call");
error = EBUSY;
else if (rule->pqname[0] != 0) {
if ((rule->pqid =
pf_qname2qid(rule->pqname)) == 0)
error = EBUSY;
} else
rule->pqid = rule->qid;
}
#endif
if (rule->tagname[0])
if ((rule->tag = pf_tagname2tag(rule->tagname)) == 0)
error = EBUSY;
if (rule->match_tagname[0])
if ((rule->match_tag =
pf_tagname2tag(rule->match_tagname)) == 0)
error = EBUSY;
if (rule->rt && !rule->direction)
error = EINVAL;
if (!rule->log)
rule->logif = 0;
if (rule->logif >= PFLOGIFS_MAX)
error = EINVAL;
if (pf_addr_setup(ruleset, &rule->src.addr, rule->af))
error = ENOMEM;
if (pf_addr_setup(ruleset, &rule->dst.addr, rule->af))
error = ENOMEM;
if (pf_kanchor_setup(rule, ruleset, pr->anchor_call))
error = EINVAL;
if (rule->scrub_flags & PFSTATE_SETPRIO &&
(rule->set_prio[0] > PF_PRIO_MAX ||
rule->set_prio[1] > PF_PRIO_MAX))
error = EINVAL;
TAILQ_FOREACH(pa, &V_pf_pabuf, entries)
if (pa->addr.type == PF_ADDR_TABLE) {
pa->addr.p.tbl = pfr_attach_table(ruleset,
pa->addr.v.tblname);
if (pa->addr.p.tbl == NULL)
error = ENOMEM;
}
rule->overload_tbl = NULL; if ((error = nvlist_error(nvl)))
if (rule->overload_tblname[0]) { ERROUT(error);
if ((rule->overload_tbl = pfr_attach_table(ruleset,
rule->overload_tblname)) == NULL)
error = EINVAL;
else
rule->overload_tbl->pfrkt_flags |=
PFR_TFLAG_ACTIVE;
}
pf_mv_kpool(&V_pf_pabuf, &rule->rpool.list); /* Frees rule on error */
if (((((rule->action == PF_NAT) || (rule->action == PF_RDR) || error = pf_ioctl_addrule(rule, ticket, pool_ticket, anchor,
(rule->action == PF_BINAT)) && rule->anchor == NULL) || anchor_call, td);
(rule->rt > PF_NOPFROUTE)) &&
(TAILQ_FIRST(&rule->rpool.list) == NULL))
error = EINVAL;
if (error) { nvlist_destroy(nvl);
pf_free_rule(rule); free(nvlpacked, M_TEMP);
PF_RULES_WUNLOCK();
break; break;
} #undef ERROUT
DIOCADDRULENV_error:
pf_krule_free(rule);
nvlist_destroy(nvl);
free(nvlpacked, M_TEMP);
rule->rpool.cur = TAILQ_FIRST(&rule->rpool.list); break;
counter_u64_zero(rule->evaluations);
for (int i = 0; i < 2; i++) {
counter_u64_zero(rule->packets[i]);
counter_u64_zero(rule->bytes[i]);
} }
TAILQ_INSERT_TAIL(ruleset->rules[rs_num].inactive.ptr, case DIOCADDRULE: {
rule, entries); struct pfioc_rule *pr = (struct pfioc_rule *)addr;
ruleset->rules[rs_num].inactive.rcount++; struct pf_krule *rule;
PF_RULES_WUNLOCK();
rule = malloc(sizeof(*rule), M_PFRULE, M_WAITOK);
error = pf_rule_to_krule(&pr->rule, rule);
if (error != 0) {
free(rule, M_PFRULE);
break; break;
}
#undef ERROUT pr->anchor[sizeof(pr->anchor) - 1] = 0;
DIOCADDRULE_error:
PF_RULES_WUNLOCK(); /* Frees rule on error */
pf_krule_free(rule); error = pf_ioctl_addrule(rule, pr->ticket, pr->pool_ticket,
pf_kkif_free(kif); pr->anchor, pr->anchor_call, td);
break; break;
} }
case DIOCGETRULES: { case DIOCGETRULES: {
struct pfioc_rule *pr = (struct pfioc_rule *)addr; struct pfioc_rule *pr = (struct pfioc_rule *)addr;
struct pf_kruleset *ruleset; struct pf_kruleset *ruleset;
struct pf_krule *tail; struct pf_krule *tail;
int rs_num; int rs_num;
▲ Show 20 Lines • Show All 2,783 Lines • Show Last 20 Lines