Page MenuHomeFreeBSD
Differential D14083

pfctl(8): Fix two wrong conditions.
ClosedPublic
Actions

Authored by pfg on Jan 27 2018, 10:34 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 14, 12:47 PM
Unknown Object (File)
Sun, Mar 9, 11:49 AM
Unknown Object (File)
Sat, Mar 8, 6:25 AM
Unknown Object (File)
Tue, Mar 4, 3:19 PM
Unknown Object (File)
Feb 20 2025, 4:39 PM
Unknown Object (File)
Feb 18 2025, 11:37 AM
Unknown Object (File)
Feb 11 2025, 9:26 PM
Unknown Object (File)
Jan 13 2025, 3:59 PM
View All 51 Files
Subscribers
imp

Details

Reviewers
kp
glebius
Commits
rS328497: pfctl(8): Fix two wrong conditions.
Summary

Caught by gcc80's -Wtautological-compare option.

Obtained from: DragonFlyBSD (git e3cdbf6c)

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

pfg created this revision.Jan 27 2018, 10:34 PM
Herald added a subscriber: imp. · View Herald TranscriptJan 27 2018, 10:34 PM
kp accepted this revision.Jan 27 2018, 10:46 PM

Good catch.

This revision is now accepted and ready to land.Jan 27 2018, 10:46 PM
Closed by commit rS328497: pfctl(8): Fix two wrong conditions. (authored by pfg). · Explain WhyJan 27 2018, 10:57 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sbin/
pfctl/
4 lines

Diff 38551

View Options

head/sbin/pfctl/pfctl_optimize.c

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Lines
static __inline uint64_t * \ static __inline uint64_t * \
name##_PCTRIE_PTR2VAL(struct type *ptr) \ name##_PCTRIE_PTR2VAL(struct type *ptr) \
{ \ { \
\ \
return &ptr->field; \ return &ptr->field; \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \ name##_PCTRIE_INSERT_BASE(struct pctrie *ptree, void *parentp, \
uint64_t *val, uint64_t *found, struct type **found_out) \
{ \ { \
struct pctrie_node *parent; \ struct pctrie_node *parent; \
void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
\ \
parentp = pctrie_insert_lookup_strict(ptree, val); \ if (__predict_false(found != NULL)) { \
if (parentp == NULL) \ *found_out = name##_PCTRIE_VAL2PTR(found); \
return (0); \ return (EEXIST); \
} \
if (parentp != NULL) { \
parent = allocfn(ptree); \ parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) \ if (__predict_false(parent == NULL)) { \
if (found_out != NULL) \
*found_out = NULL; \
return (ENOMEM); \ return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \ pctrie_insert_node(parentp, parent, val); \
} \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \
{ \
void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
\
parentp = pctrie_insert_lookup_strict(ptree, val); \
return (name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
NULL, NULL)); \
} \
\
static __inline __unused int \
name##_PCTRIE_FIND_OR_INSERT(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_FIND_OR_INSERT(struct pctrie *ptree, struct type *ptr, \
struct type **found_out_opt) \ struct type **found_out_opt) \
{ \ { \
struct pctrie_node *parent; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
\ \
parentp = pctrie_insert_lookup(ptree, val, &found); \ parentp = pctrie_insert_lookup(ptree, val, &found); \
if (found != NULL) { \ return (name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
if (found_out_opt != NULL) \ found, found_out_opt)); \
*found_out_opt = name##_PCTRIE_VAL2PTR(found); \
return (EEXIST); \
} \ } \
if (parentp == NULL) \
return (0); \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) \
return (ENOMEM); \
pctrie_insert_node(parentp, parent, val); \
return (0); \
} \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT_LOOKUP_GE(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_INSERT_LOOKUP_GE(struct pctrie *ptree, struct type *ptr, \
struct type **found_out) \ struct type **found_out) \
{ \ { \
struct pctrie_node *parent, *neighbor; \ struct pctrie_node *neighbor; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
int retval; \
\ \
parentp = pctrie_insert_lookup_gt(ptree, val, &found, \ parentp = pctrie_insert_lookup_gt(ptree, val, &found, \
&neighbor); \ &neighbor); \
if (__predict_false(found != NULL)) { \ retval = name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
*found_out = name##_PCTRIE_VAL2PTR(found); \ found, found_out); \
return (EEXIST); \ if (retval != 0) \
} \ return (retval); \
if (parentp != NULL) { \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) { \
*found_out = NULL; \
return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \
} \
found = pctrie_subtree_lookup_gt(neighbor, *val); \ found = pctrie_subtree_lookup_gt(neighbor, *val); \
*found_out = name##_PCTRIE_VAL2PTR(found); \ *found_out = name##_PCTRIE_VAL2PTR(found); \
pctrie_subtree_lookup_gt_assert(neighbor, *val, ptree, found); \ pctrie_subtree_lookup_gt_assert(neighbor, *val, ptree, found); \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused int \ static __inline __unused int \
name##_PCTRIE_INSERT_LOOKUP_LE(struct pctrie *ptree, struct type *ptr, \ name##_PCTRIE_INSERT_LOOKUP_LE(struct pctrie *ptree, struct type *ptr, \
struct type **found_out) \ struct type **found_out) \
{ \ { \
struct pctrie_node *parent, *neighbor; \ struct pctrie_node *neighbor; \
void *parentp; \ void *parentp; \
uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \
uint64_t *found; \ uint64_t *found; \
int retval; \
\ \
parentp = pctrie_insert_lookup_lt(ptree, val, &found, \ parentp = pctrie_insert_lookup_lt(ptree, val, &found, \
&neighbor); \ &neighbor); \
if (__predict_false(found != NULL)) { \ retval = name##_PCTRIE_INSERT_BASE(ptree, parentp, val, \
*found_out = name##_PCTRIE_VAL2PTR(found); \ found, found_out); \
return (EEXIST); \ if (retval != 0) \
} \ return (retval); \
if (parentp != NULL) { \
parent = allocfn(ptree); \
if (__predict_false(parent == NULL)) { \
*found_out = NULL; \
return (ENOMEM); \
} \
pctrie_insert_node(parentp, parent, val); \
} \
found = pctrie_subtree_lookup_lt(neighbor, *val); \ found = pctrie_subtree_lookup_lt(neighbor, *val); \
*found_out = name##_PCTRIE_VAL2PTR(found); \ *found_out = name##_PCTRIE_VAL2PTR(found); \
pctrie_subtree_lookup_lt_assert(neighbor, *val, ptree, found); \ pctrie_subtree_lookup_lt_assert(neighbor, *val, ptree, found); \
return (0); \ return (0); \
} \ } \
\ \
static __inline __unused struct type * \ static __inline __unused struct type * \
name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \ name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \
▲ Show 20 Lines • Show All 297 Lines • Show Last 20 Lines