From 316cdd9a46badfbc41af643eee30a9d70fcf10a7 Mon Sep 17 00:00:00 2001 From: Forest Bond Date: Sat, 13 Jun 2009 07:38:47 -0400 Subject: [PATCH] --- yaml --- r: 161988 b: refs/heads/master c: 8f9c466f291a94b138560f28242c44e320a79ca4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/main_usb.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index af8de238ff54..8af23c372c2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f02a8cbc50aaef89f56faf0cf1e27fa5a80faec6 +refs/heads/master: 8f9c466f291a94b138560f28242c44e320a79ca4 diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c index 3368e8354fe5..f181d237e9ef 100644 --- a/trunk/drivers/staging/vt6656/main_usb.c +++ b/trunk/drivers/staging/vt6656/main_usb.c @@ -1655,15 +1655,17 @@ static UCHAR *Config_FileOperation(PSDevice pDevice) { UCHAR *buffer=NULL; struct file *filp=NULL; mm_segment_t old_fs = get_fs(); - int oldfsuid=0,oldfsgid=0; + //int oldfsuid=0,oldfsgid=0; int result=0; set_fs (KERNEL_DS); -//Make sure a caller can read or write power as root - oldfsuid=current->fsuid; - oldfsgid=current->fsgid; + /* Can't do this anymore, so we rely on correct filesystem permissions: + //Make sure a caller can read or write power as root + oldfsuid=current->fsuid; + oldfsgid=current->fsgid; current->fsuid = 0; current->fsgid = 0; + */ //open file filp = filp_open(config_path, O_RDWR, 0); @@ -1697,8 +1699,11 @@ static UCHAR *Config_FileOperation(PSDevice pDevice) { error2: set_fs (old_fs); + + /* current->fsuid=oldfsuid; current->fsgid=oldfsgid; + */ if(result!=0) { if(buffer)