mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

meta-flow: Avoid null pointer dereference in mf_format_frag_string().

Browse Source 
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>
This commit is contained in:
Ben Pfaff
2013-01-24 13:39:23 -08:00
parent b47e6df6be
commit 8f75dea3e4
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/meta-flow.c
View File

@@ -2235,15 +2235,12 @@ mf_format_integer_string(const struct mf_field *mf, const uint8_t *valuep,
}
static void
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;
uint8_t value = *valuep;
uint8_t mask = *maskp;
value &= mask;
mask &= FLOW_NW_FRAG_MASK;
value &= mask;
for (h = all_frags; h < &all_frags[ARRAY_SIZE(all_frags)]; h++) {
if (value == h->value && mask == h->mask) {
@@ -2302,7 +2299,7 @@ mf_format(const struct mf_field *mf,
break;
case MFS_FRAG:
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: