Commit 64c6013

committed

ON-17066: fix argument passing to onload-spawned shrub controller

Without this patch, if any of the optional arguments weren't wanted, it would be replaced by NULL. This would be interpreted as the end of the argument list, so all other arguments after that point would be ignored.

1 parent 6994a99 commit 64c6013Copy full SHA for 64c6013

File tree

1 file changed

+16

-2

lines changed

src/driver/linux_onload
- shrub_fns.c

1 file changed

+16

-2

lines changed

`‎src/driver/linux_onload/shrub_fns.c‎`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,20 +97,34 @@ static int shrub_spawn_server(char* controller_id, bool debug,`
`97`	`97`	`controller_id,`
`98`	`98`	`"-D",`
`99`	`99`	`"-K",`
`100`		`- debug ? "-d" : NULL,`
`101`		`- use_interrupts ? "-i" : NULL,`
	`100`	`+ /* slots for extra args */`
	`101`	`+ NULL,`
	`102`	`+ NULL,`
	`103`	`+ /* terminator */`
`102`	`104`	`NULL`
`103`	`105`	`};`
`104`	`106`	`char* envp_flags = "";`
`105`	`107`	`char* envp[] = {`
`106`	`108`	`envp_flags,`
`107`	`109`	`NULL`
`108`	`110`	`};`
	`111`	`+ /* This must be the index of the first NULL slot in the argv array */`
	`112`	`+ int extra_arg_idx = 5;`
`109`	`113`
`110`	`114`	`path = kmalloc(PATH_MAX, GFP_KERNEL);`
`111`	`115`	`if ( !path )`
`112`	`116`	`return -ENOMEM;`
`113`	`117`
	`118`	`+ if( debug )`
	`119`	`+ argv[extra_arg_idx++] = "-d";`
	`120`	`+`
	`121`	`+ if( use_interrupts )`
	`122`	`+ argv[extra_arg_idx++] = "-i";`
	`123`	`+`
	`124`	`+ /* We must create enough slots for extra arguments we pass to the shrub`
	`125`	`+ * controller, as otherwise we may not terminate the array correctly. */`
	`126`	`+ BUG_ON(extra_arg_idx >= (sizeof(argv) / sizeof(argv[0])));`
	`127`	`+`
`114`	`128`	`spin_lock(&shrub_lock);`
`115`	`129`	`strncpy(path, shrub_get_controller_path(), PATH_MAX);`
`116`	`130`	`path[PATH_MAX - 1] = '0円';`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 64c6013

File tree

1 file changed

1 file changed

`‎src/driver/linux_onload/shrub_fns.c‎`

0 commit comments