The 'maskp' parameter to this function can be NULL, but the function
always dereferenced it. This commit fixes the problem.
This commit also fixes the order in which the value and mask were adjusted
to correctly discard 1-bits outside of FLOW_NW_FRAG_MASK.
Found by Coverity.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
-mf_format_frag_string(const uint8_t *valuep, const uint8_t *maskp,
- struct ds *s)
+mf_format_frag_string(uint8_t value, uint8_t mask, struct ds *s)
{
const struct frag_handling *h;
{
const struct frag_handling *h;
- uint8_t value = *valuep;
- uint8_t mask = *maskp;
mask &= FLOW_NW_FRAG_MASK;
mask &= FLOW_NW_FRAG_MASK;
for (h = all_frags; h < &all_frags[ARRAY_SIZE(all_frags)]; h++) {
if (value == h->value && mask == h->mask) {
for (h = all_frags; h < &all_frags[ARRAY_SIZE(all_frags)]; h++) {
if (value == h->value && mask == h->mask) {
- mf_format_frag_string(&value->u8, &mask->u8, s);
+ mf_format_frag_string(value->u8, mask ? mask->u8 : UINT8_MAX, s);
break;
case MFS_TNL_FLAGS:
break;
case MFS_TNL_FLAGS: