d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove never set flag FL_OVERWRITE. The only place where

Browse Source 
it was checked led to lock/critnest leak.
This commit is contained in:
Gleb Smirnoff 2014-02-08 09:56:26 +00:00
parent bf73979dd9
commit 603819bc74
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/flowtable.c
View File

@ -280,7 +280,6 @@ flowtable_pcpu_unlock(struct flowtable *table, uint32_t hash)
#define FL_ENTRY_UNLOCK(table, hash) (table)->ft_unlock((table), (hash))
#define FL_STALE (1<<8)
#define FL_OVERWRITE (1<<10)
static struct flentry *flowtable_lookup_common(struct flowtable *,
struct sockaddr_storage *, struct sockaddr_storage *, struct mbuf *, int);
@ -833,8 +832,6 @@ flowtable_insert(struct flowtable *ft, uint32_t hash, uint32_t *key,
FL_ENTRY_UNLOCK(ft, hash);
uma_zfree(ft->ft_zone, newfle);
if (flags & FL_OVERWRITE)
goto skip;
return (EEXIST);
}
/*

4
sys/net/pfvar.h
View File

@ -1580,8 +1580,6 @@ extern struct pf_src_node *pf_find_src_node(struct pf_addr *,
extern void pf_unlink_src_node(struct pf_src_node *);
extern void pf_unlink_src_node_locked(struct pf_src_node *);
extern u_int pf_free_src_nodes(struct pf_src_node_list *);
extern void pf_print_state(struct pf_state *);
extern void pf_print_flags(u_int8_t);
extern u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t,
u_int8_t);
@ -1744,8 +1742,6 @@ int pf_osfp_get(struct pf_osfp_ioctl *);
int pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t);
#ifdef _KERNEL
void pf_print_host(struct pf_addr *, u_int16_t, u_int8_t);
void pf_step_into_anchor(struct pf_anchor_stackframe *, int *,
struct pf_ruleset **, int, struct pf_rule **,
struct pf_rule **, int *);