Commit 5dba0826 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: p9auth: fix credential logic

current->uid is no longer allowed in the 2.6.29 kernel, so use
the proper credential api to be able to alter the uid and euid values.

Note, this now builds properly, hopefully still works properly, would be
good for someone to test it out...

Cc: Ashwin Ganti <ashwin.ganti@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 55643171
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/sched.h>
#include <linux/cred.h>
#include "p9auth.h" #include "p9auth.h"
int cap_major = CAP_MAJOR; int cap_major = CAP_MAJOR;
...@@ -104,6 +106,7 @@ cap_write(struct file * filp, const char __user * buf, ...@@ -104,6 +106,7 @@ cap_write(struct file * filp, const char __user * buf,
struct list_head *pos; struct list_head *pos;
struct cap_dev *dev = filp->private_data; struct cap_dev *dev = filp->private_data;
ssize_t retval = -ENOMEM; ssize_t retval = -ENOMEM;
struct cred *new;
int len, target_int, source_int, flag = 0; int len, target_int, source_int, flag = 0;
char *user_buf, *user_buf_running, *source_user, *target_user, char *user_buf, *user_buf_running, *source_user, *target_user,
*rand_str, *hash_str, *result; *rand_str, *hash_str, *result;
...@@ -177,7 +180,7 @@ cap_write(struct file * filp, const char __user * buf, ...@@ -177,7 +180,7 @@ cap_write(struct file * filp, const char __user * buf,
/* Check whether the process writing to capuse is actually owned by /* Check whether the process writing to capuse is actually owned by
* the source owner * the source owner
*/ */
if (source_int != current->uid) { if (source_int != current_uid()) {
printk(KERN_ALERT printk(KERN_ALERT
"Process is not owned by the source user of the capability.\n"); "Process is not owned by the source user of the capability.\n");
retval = -EFAULT; retval = -EFAULT;
...@@ -187,8 +190,16 @@ cap_write(struct file * filp, const char __user * buf, ...@@ -187,8 +190,16 @@ cap_write(struct file * filp, const char __user * buf,
* Currently I am changing the effective user id * Currently I am changing the effective user id
* since most of the authorisation decisions are based on it * since most of the authorisation decisions are based on it
*/ */
current->uid = (uid_t) target_int; new = prepare_creds();
current->euid = (uid_t) target_int; if (!new) {
retval = -ENOMEM;
goto out;
}
new->uid = (uid_t) target_int;
new->euid = (uid_t) target_int;
retval = commit_creds(new);
if (retval)
goto out;
/* Remove the capability from the list and break */ /* Remove the capability from the list and break */
tmp = tmp =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment