git: f61af036ab29 - stable/13 - procfs: return right hardlink from /proc/curproc/file
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 06 Nov 2021 02:25:25 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=f61af036ab291b558e8632bc58290b3321c2bafc
commit f61af036ab291b558e8632bc58290b3321c2bafc
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-10-29 01:43:32 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-11-06 02:12:32 +0000
procfs: return right hardlink from /proc/curproc/file
PR: 248184
(cherry picked from commit e5248548f95ff1c89667847e0d945dea38adeca7)
---
sys/fs/procfs/procfs.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/sys/fs/procfs/procfs.c b/sys/fs/procfs/procfs.c
index c492533c52bb..697bbfc9877a 100644
--- a/sys/fs/procfs/procfs.c
+++ b/sys/fs/procfs/procfs.c
@@ -69,22 +69,17 @@
int
procfs_doprocfile(PFS_FILL_ARGS)
{
- char *fullpath;
- char *freepath;
- struct vnode *textvp;
+ char *fullpath, *freepath, *binpath;
int error;
freepath = NULL;
+ binpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
PROC_LOCK(p);
- textvp = p->p_textvp;
- vhold(textvp);
- PROC_UNLOCK(p);
- error = vn_fullpath(textvp, &fullpath, &freepath);
- vdrop(textvp);
+ error = proc_get_binpath(p, binpath, &fullpath, &freepath);
if (error == 0)
- sbuf_printf(sb, "%s", fullpath);
- if (freepath != NULL)
- free(freepath, M_TEMP);
+ sbuf_printf(sb, "%s", fullpath == NULL ? "" : fullpath);
+ free(binpath, M_TEMP);
+ free(freepath, M_TEMP);
return (error);
}