git: c8bbb1272c8b - main - vfs: Fix error handling in vn_fullpath_hardlink()

[Mark Johnston]

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=c8bbb1272c8bc103cfaa42c7a1639f42b62483dd

commit c8bbb1272c8bc103cfaa42c7a1639f42b62483dd
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-05-11 00:18:00 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-05-11 00:22:27 +0000

    vfs: Fix error handling in vn_fullpath_hardlink()
    
    vn_fullpath_any_smr() will return a positive error number if the
    caller-supplied buffer isn't big enough.  In this case the error must be
    propagated up, otherwise we may copy out uninitialized bytes.
    
    Reported by:    syzkaller+KMSAN
    Reviewed by:    mjg, kib
    MFC aftr:       3 days
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D30198
---
 sys/kern/vfs_cache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 2aaaecb5cd4d..607b1e67a40a 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -3646,9 +3646,9 @@ vn_fullpath_hardlink(struct nameidata *ndp, char **retbuf, char **freebuf,
 		error = vn_fullpath_dir(vp, pwd->pwd_rdir, buf, retbuf, buflen,
 		    addend);
 		pwd_drop(pwd);
-		if (error != 0)
-			goto out_bad;
 	}
+	if (error != 0)
+		goto out_bad;
 
 	*freebuf = buf;