Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 402acd29 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

knfsd: avoid use of unitialised variables on error path when nfs exports 



We need to zero various parts of 'exp' before any 'goto out', otherwise when
we go to free the contents...  we die.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5bd5f581

fs/nfsd/export.c

+7 −7
Original line number Diff line number Diff line
@@ -469,6 +469,13 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) 
	nd.dentry = NULL;

	exp.ex_path = NULL;



	/* fs locations */

	exp.ex_fslocs.locations = NULL;

	exp.ex_fslocs.locations_count = 0;

	exp.ex_fslocs.migrated = 0;



	exp.ex_uuid = NULL;



	if (mesg[mlen-1] != '\n')

		return -EINVAL;

	mesg[mlen-1] = 0;
@@ -509,13 +516,6 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) 
	if (exp.h.expiry_time == 0)

		goto out;



	/* fs locations */

	exp.ex_fslocs.locations = NULL;

	exp.ex_fslocs.locations_count = 0;

	exp.ex_fslocs.migrated = 0;



	exp.ex_uuid = NULL;



	/* flags */

	err = get_int(&mesg, &an_int);

	if (err == -ENOENT)