/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
return cap_raised(current_cap(), cfs_cap_unpack(cap));
}
-void cfs_kernel_cap_pack(cfs_kernel_cap_t kcap, cfs_cap_t *cap)
+void cfs_kernel_cap_pack(kernel_cap_t kcap, cfs_cap_t *cap)
{
#if defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x19980330
*cap = cfs_cap_pack(kcap);
#endif
}
-void cfs_kernel_cap_unpack(cfs_kernel_cap_t *kcap, cfs_cap_t cap)
+void cfs_kernel_cap_unpack(kernel_cap_t *kcap, cfs_cap_t cap)
{
#if defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x19980330
*kcap = cfs_cap_unpack(cap);
return capable(cfs_cap_unpack(cap));
}
-/* Check if task is running in 32-bit API mode, for the purpose of
- * userspace binary interfaces. On 32-bit Linux this is (unfortunately)
- * always true, even if the application is using LARGEFILE64 and 64-bit
- * APIs, because Linux provides no way for the filesystem to know if it
- * is called via 32-bit or 64-bit APIs. Other clients may vary. On
- * 64-bit systems, this will only be true if the binary is calling a
- * 32-bit system call. */
-int cfs_curproc_is_32bit(void)
-{
-#ifdef HAVE_IS_COMPAT_TASK
- return is_compat_task();
-#else
- return (BITS_PER_LONG == 32);
-#endif
-}
-
static int cfs_access_process_vm(struct task_struct *tsk, unsigned long addr,
void *buf, int len, int write)
{
-#ifdef HAVE_ACCESS_PROCESS_VM
- return access_process_vm(tsk, addr, buf, len, write);
-#else
/* Just copied from kernel for the kernels which doesn't
* have access_process_vm() exported */
struct mm_struct *mm;
down_read(&mm->mmap_sem);
/* ignore errors, just check how much was sucessfully transfered */
while (len) {
- int bytes, ret, offset;
+ int bytes, rc, offset;
void *maddr;
- ret = get_user_pages(tsk, mm, addr, 1,
+ rc = get_user_pages(tsk, mm, addr, 1,
write, 1, &page, &vma);
- if (ret <= 0)
+ if (rc <= 0)
break;
bytes = len;
mmput(mm);
return buf - old_buf;
-#endif /* HAVE_ACCESS_PROCESS_VM */
}
/* Read the environment variable of current process specified by @key. */
int cfs_get_environ(const char *key, char *value, int *val_len)
{
struct mm_struct *mm;
- char *buffer, *tmp_buf = NULL;
- int buf_len = CFS_PAGE_SIZE;
+ char *buffer;
+ int buf_len = PAGE_CACHE_SIZE;
+ int key_len = strlen(key);
unsigned long addr;
- int ret;
+ int rc;
ENTRY;
- buffer = (char *)cfs_alloc(buf_len, CFS_ALLOC_USER);
+ buffer = kmalloc(buf_len, GFP_USER);
if (!buffer)
RETURN(-ENOMEM);
mm = get_task_mm(current);
if (!mm) {
- cfs_free((void *)buffer);
+ kfree(buffer);
RETURN(-EINVAL);
}
* which is already holding mmap_sem for writes. If some other
* thread gets the write lock in the meantime, this thread will
* block, but at least it won't deadlock on itself. LU-1735 */
- if (down_read_trylock(&mm->mmap_sem) == 0)
+ if (down_read_trylock(&mm->mmap_sem) == 0) {
+ kfree(buffer);
return -EDEADLK;
+ }
up_read(&mm->mmap_sem);
addr = mm->env_start;
- ret = -ENOENT;
-
while (addr < mm->env_end) {
int this_len, retval, scan_len;
char *env_start, *env_end;
memset(buffer, 0, buf_len);
- this_len = min((int)(mm->env_end - addr), buf_len);
+ this_len = min_t(int, mm->env_end - addr, buf_len);
retval = cfs_access_process_vm(current, addr, buffer,
this_len, 0);
if (retval != this_len)
char *entry;
int entry_len;
- env_end = (char *)memscan(env_start, '\0', scan_len);
+ env_end = memscan(env_start, '\0', scan_len);
LASSERT(env_end >= env_start &&
env_end <= env_start + scan_len);
/* This entry is too large to fit in buffer */
if (unlikely(scan_len == this_len)) {
CERROR("Too long env variable.\n");
- ret = -EINVAL;
- goto out;
+ GOTO(out, rc = -EINVAL);
}
addr -= scan_len;
break;
entry_len = env_end - env_start;
/* Key length + length of '=' */
- if (entry_len > strlen(key) + 1 &&
- !memcmp(entry, key, strlen(key))) {
- entry += (strlen(key) + 1);
- entry_len -= (strlen(key) + 1);
+ if (entry_len > key_len + 1 &&
+ !memcmp(entry, key, key_len)) {
+ entry += key_len + 1;
+ entry_len -= key_len + 1;
/* The 'value' buffer passed in is too small.*/
- if (entry_len >= *val_len) {
- CERROR("Buffer is too small. "
- "entry_len=%d buffer_len=%d\n",
- entry_len, *val_len);
- ret = -EOVERFLOW;
- } else {
- memcpy(value, entry, entry_len);
- *val_len = entry_len;
- ret = 0;
- }
- goto out;
+ if (entry_len >= *val_len)
+ GOTO(out, rc = -EOVERFLOW);
+
+ memcpy(value, entry, entry_len);
+ *val_len = entry_len;
+ GOTO(out, rc = 0);
}
scan_len -= (env_end - env_start + 1);
env_start = env_end + 1;
}
}
+ GOTO(out, rc = -ENOENT);
+
out:
mmput(mm);
- cfs_free((void *)buffer);
- if (tmp_buf)
- cfs_free((void *)tmp_buf);
- RETURN(ret);
+ kfree((void *)buffer);
+ return rc;
}
EXPORT_SYMBOL(cfs_get_environ);
EXPORT_SYMBOL(cfs_curproc_cap_pack);
EXPORT_SYMBOL(cfs_curproc_cap_unpack);
EXPORT_SYMBOL(cfs_capable);
-EXPORT_SYMBOL(cfs_curproc_is_32bit);
/*
* Local variables:
git://git.whamcloud.com / fs / lustre-release.git / blobdiff