diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-15 14:09:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-15 14:09:47 -0700 |
| commit | 96fca68c4fbf77a8185eb10f7557e23352732ea2 (patch) | |
| tree | 0875a98d280928f617b735f51e5cf7a906b5cd41 /include | |
| parent | cef27048e5c2f88677a647c336fae490e9c5492a (diff) | |
| parent | f488138b526715c6d2568d7329c4477911be4210 (diff) | |
| download | linux-96fca68c4fbf77a8185eb10f7557e23352732ea2.tar.gz | |
Merge tag 'nfsd-6.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- Fix a potential tracepoint crash
- Fix NFSv4 GETATTR on big-endian platforms
* tag 'nfsd-6.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
NFSD: fix endianness issue in nfsd4_encode_fattr4
SUNRPC: Fix rpcgss_context trace event acceptor field
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/rpcgss.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/rpcgss.h b/include/trace/events/rpcgss.h index ba2d96a1bc2f9..f50fcafc69de2 100644 --- a/include/trace/events/rpcgss.h +++ b/include/trace/events/rpcgss.h @@ -609,7 +609,7 @@ TRACE_EVENT(rpcgss_context, __field(unsigned int, timeout) __field(u32, window_size) __field(int, len) - __string(acceptor, data) + __string_len(acceptor, data, len) ), TP_fast_assign( @@ -618,7 +618,7 @@ TRACE_EVENT(rpcgss_context, __entry->timeout = timeout; __entry->window_size = window_size; __entry->len = len; - strncpy(__get_str(acceptor), data, len); + __assign_str(acceptor, data); ), TP_printk("win_size=%u expiry=%lu now=%lu timeout=%u acceptor=%.*s", |