diff options
| author | Anna Schumaker <Anna.Schumaker@netapp.com> | 2015-10-05 16:43:26 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-10-06 18:56:25 -0400 |
| commit | 39d0d3bdf7bab3021a31e501172ac0f18947f9b3 (patch) | |
| tree | 34bfd328291cecfa188a80e3674de0873aa5ceb1 /fs | |
| parent | 8dbb09570d16929fefd492410d60a918bc18ad5b (diff) | |
| download | linux-39d0d3bdf7bab3021a31e501172ac0f18947f9b3.tar.gz linux-39d0d3bdf7bab3021a31e501172ac0f18947f9b3.tar.bz2 linux-39d0d3bdf7bab3021a31e501172ac0f18947f9b3.zip | |
NFS: Fix a tracepoint NULL-pointer dereference
Running xfstest generic/013 with the tracepoint nfs:nfs4_open_file
enabled produces a NULL-pointer dereference when calculating fileid and
filehandle of the opened file. Fix this by checking if state is NULL
before trying to use the inode pointer.
Reported-by: Olga Kornievskaia <aglo@umich.edu>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index 28df12e525ba..671cf68fe56b 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -409,7 +409,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event, __entry->flags = flags; __entry->fmode = (__force unsigned int)ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev; - if (!IS_ERR(state)) + if (!IS_ERR_OR_NULL(state)) inode = state->inode; if (inode != NULL) { __entry->fileid = NFS_FILEID(inode); |