Merge lp:~tyhicks/ecryptfs/cid1375979 into lp:ecryptfs

[Tyler Hicks]

Remove unreachable code when parsing mount opt name value pairs

Revision 886 introduced a change to the mount option parsing code for
name-value pairs. A break was added to a loop once the first '=' is seen.
Before the break was added, it was possible that a '=' would be seen, then
memory allocated for the name portion of the string, then another '=' could be
seen and the previous name string be freed and then reallocated. However,
there's no longer a chance of needed to reallocate the name string so the
free() is not needed.

Discovered by Coverity (CID 1375979)

[Jason Xing (wlxing)]

Thanks, Tyler.

You're right. We don't need to reallocate the memory for previous name string because we "break" the loop if we match the first "=". So the patch looks good for me :)

review: Approve

[Tyler Hicks (tyhicks)]

Thanks for the review!

=== modified file 'src/libecryptfs/cmd_ln_parser.c'
--- src/libecryptfs/cmd_ln_parser.c	2017-05-25 21:22:24 +0000
+++ src/libecryptfs/cmd_ln_parser.c	2017-06-09 15:33:38 +0000
@@ -288,8 +288,6 @@
 	j = 0;
 	for (i = 0; i < st_len; i++)
 		if (sub_token[i] == '=') {
-			if (name)
-				free(name);
 			if (!(name = malloc(i + 1))) {
 				rc = -ENOMEM;
 				goto out;