From 4263622fc703980c9f1ac1fd6e2391d96fb6f97a Mon Sep 17 00:00:00 2001 From: Patrick Caulfeld Date: Thu, 17 Jan 2008 10:25:28 +0000 Subject: [PATCH] --- yaml --- r: 80619 b: refs/heads/master c: 2a79289e87f3b6487b5fd23c8569f32097057fb4 h: refs/heads/master i: 80617: 35f9a1d635e53733f2451ef3388b16fa57e2c6b7 80615: 63d551448f1ab432808be592419cf68dee615944 v: v3 --- [refs] | 2 +- trunk/fs/dlm/user.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0d79c6d8c72a..b01122b01c62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85f0379aa0f9366bb6918e2e898a915231176fbd +refs/heads/master: 2a79289e87f3b6487b5fd23c8569f32097057fb4 diff --git a/trunk/fs/dlm/user.c b/trunk/fs/dlm/user.c index eb6164816948..1acb4c5813cd 100644 --- a/trunk/fs/dlm/user.c +++ b/trunk/fs/dlm/user.c @@ -82,7 +82,8 @@ struct dlm_lock_result32 { }; static void compat_input(struct dlm_write_request *kb, - struct dlm_write_request32 *kb32) + struct dlm_write_request32 *kb32, + int max_namelen) { kb->version[0] = kb32->version[0]; kb->version[1] = kb32->version[1]; @@ -112,7 +113,11 @@ static void compat_input(struct dlm_write_request *kb, kb->i.lock.bastaddr = (void *)(long)kb32->i.lock.bastaddr; kb->i.lock.lksb = (void *)(long)kb32->i.lock.lksb; memcpy(kb->i.lock.lvb, kb32->i.lock.lvb, DLM_USER_LVB_LEN); - memcpy(kb->i.lock.name, kb32->i.lock.name, kb->i.lock.namelen); + if (kb->i.lock.namelen <= max_namelen) + memcpy(kb->i.lock.name, kb32->i.lock.name, + kb->i.lock.namelen); + else + kb->i.lock.namelen = max_namelen; } } @@ -529,7 +534,8 @@ static ssize_t device_write(struct file *file, const char __user *buf, if (proc) set_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags); - compat_input(kbuf, k32buf); + compat_input(kbuf, k32buf, + count - sizeof(struct dlm_write_request32)); kfree(k32buf); } #endif