Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 15:19:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFSD: Prevent a possible oops in the nfs_dirent() tracepoint

Browse Source 
The double copy of the string is a mistake, plus __assign_str()
uses strlen(), which is wrong to do on a string that isn't
guaranteed to be NUL-terminated.

Fixes: 6019ce0742ca ("NFSD: Add a tracepoint to record directory entry encoding")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Chuck Lever 2021-06-25 11:12:49 -04:00 committed by J. Bruce Fields
parent e34c0ce913
commit 7b08cf62b1
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfsd/trace.h
View File

@ -408,7 +408,6 @@ TRACE_EVENT(nfsd_dirent,
__entry->ino = ino; __entry->ino = ino;
__entry->len = namlen; __entry->len = namlen;
memcpy(__get_str(name), name, namlen); memcpy(__get_str(name), name, namlen);
__assign_str(name, name);
), ),
TP_printk("fh_hash=0x%08x ino=%llu name=%.*s", TP_printk("fh_hash=0x%08x ino=%llu name=%.*s",
__entry->fh_hash, __entry->ino, __entry->fh_hash, __entry->ino,