matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: netlink fuzzing path correction

Browse source 
Correct use of netlink_parse_info() in the netlink fuzzing path.
Also clarify a couple of comments about pthreads.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2018-08-06 16:19:45 -04:00
parent fe2c53d4ea
commit 1bcea841b1
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zebra/kernel_netlink.c
View file

@ -314,11 +314,17 @@ bool netlink_read;
*/ */
void netlink_read_init(const char *fname) void netlink_read_init(const char *fname)
{ {
struct zebra_dplane_info dp_info;
snprintf(netlink_fuzz_file, MAXPATHLEN, "%s", fname); snprintf(netlink_fuzz_file, MAXPATHLEN, "%s", fname);
/* Creating this fake socket for testing purposes */ /* Creating this fake socket for testing purposes */
struct zebra_ns *zns = zebra_ns_lookup(NS_DEFAULT); struct zebra_ns *zns = zebra_ns_lookup(NS_DEFAULT);
netlink_parse_info(netlink_information_fetch, &zns->netlink, zns, 1, 0); /* Capture key info from zns struct */
zebra_dplane_info_from_zns(&dp_info, zns, false);
netlink_parse_info(netlink_information_fetch, &zns->netlink,
&dp_info, 1, 0);
} }
/** /**

6
zebra/zebra_dplane.c
View file

@ -740,7 +740,7 @@ int dplane_provider_register(const char *name,
} }
if (prio <= DPLANE_PRIO_NONE || if (prio <= DPLANE_PRIO_NONE ||
prio >= DPLANE_PRIO_LAST) { prio > DPLANE_PRIO_LAST) {
ret = EINVAL; ret = EINVAL;
goto done; goto done;
} }
@ -798,7 +798,9 @@ static void zebra_dplane_init_internal(struct zebra_t *zebra)
/* TODO -- register kernel 'provider' during init */ /* TODO -- register kernel 'provider' during init */
/* TODO -- using zebra core event thread temporarily */ /* TODO -- start dataplane pthread. We're using the zebra
* core/main thread temporarily
*/
zdplane_g.dg_master = zebra->master; zdplane_g.dg_master = zebra->master;
} }

2
zebra/zebra_rib.c
View file

@ -3305,7 +3305,7 @@ static int rib_process_dplane_results(struct thread *thread)
/* /*
* Results are returned from the dataplane subsystem, in the context of * Results are returned from the dataplane subsystem, in the context of
* the dataplane thread. We enqueue the results here for processing by * the dataplane pthread. We enqueue the results here for processing by
* the main thread later. * the main thread later.
*/ */
static int rib_dplane_results(dplane_ctx_h ctx) static int rib_dplane_results(dplane_ctx_h ctx)