summaryrefslogtreecommitdiffstats
path: root/fs/dlm/user.c
diff options
context:
space:
mode:
authorMasatake YAMATO <yamato@redhat.com>2008-05-28 07:45:10 +0200
committerDavid Teigland <teigland@redhat.com>2008-07-14 20:56:59 +0200
commit254ae43ab8d7877c980fca3636624e0777a70fa4 (patch)
tree2a68101ba1c053d167a3f5effed6c33ab1043972 /fs/dlm/user.c
parentLinux 2.6.26 (diff)
downloadlinux-254ae43ab8d7877c980fca3636624e0777a70fa4.tar.xz
linux-254ae43ab8d7877c980fca3636624e0777a70fa4.zip
dlm: check for null in device_write
If `device_write' method is called via "dlm-control", file->private_data is NULL. (See ctl_device_open() in user.c. ) Through proc->flags is read. Signed-off-by: Masatake YAMATO <yamato@redhat.com> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/user.c')
-rw-r--r--fs/dlm/user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index ebbcf38fd33b..1aa76b32d056 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -538,7 +538,7 @@ static ssize_t device_write(struct file *file, const char __user *buf,
/* do we really need this? can a write happen after a close? */
if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) &&
- test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))
+ (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags)))
return -EINVAL;
sigfillset(&allsigs);