gpl-source-mybooklive-02.32.05-044.zipgpl-source-mybooklive-02.43.03-022.zipgpl-source-mybooklive-02.42.03-027.zipgpl-source-mybooklive-02.42.02-012.zipgpl-source-mybooklive-02.41.05-034.zipgpl-source-mybooklive-02.32.05-046.zipgpl-source-mybooklive-02.32.05-044.zipmybooklive

2 files changed, 15 insertions, 22 deletions

diff --git a/drivers/leds/leds-apollo3g.c b/drivers/leds/leds-apollo3g.c
index 5fc791383c3..dee0e92fa5a 100644
--- a/drivers/leds/leds-apollo3g.c
+++ b/drivers/leds/leds-apollo3g.c
@@ -91,27 +91,7 @@ u8 write_3gled( u8 mask ,u8 value ) {
 static enum led_brightness a3g_led_get( struct led_classdev * led_cdev ) {
    unsigned char readval;
 
-   readval = readb(led_port);
-   if( (readval & _3G_BIT_LED_ALL) == _3G_BIT_LED_RED ) {
-      readval = _3G_LED_RED;
-   }
-   else if( (readval & _3G_BIT_LED_ALL) == _3G_BIT_LED_GREEN ) {
-      readval = _3G_LED_GREEN;
-   }
-   else if( (readval & _3G_BIT_LED_ALL) == _3G_BIT_LED_BLUE ) {
-      readval = _3G_LED_BLUE;
-   }
-   else if( (readval & _3G_BIT_LED_ALL) == _3G_BIT_LED_YELLOW ) {
-      readval = _3G_LED_YELLOW;
-   }
-   else if( (readval & _3G_BIT_LED_ALL) == _3G_BIT_LED_ALL ) {
-      readval = _3G_LED_ALL;
-   }
-   else if( (readval & _3G_BIT_LED_ALL) == _3G_BIT_LED_OFF ) {
-      readval = _3G_LED_OFF;
-   }
- 
-   return readval;
+   return led_state.cur_color;
 }
 
 /****************************************************/
diff --git a/security/trustees/security.c b/security/trustees/security.c
index bbc98886243..d59d71a9752 100755
--- a/security/trustees/security.c
+++ b/security/trustees/security.c
@@ -46,6 +46,7 @@ static int trustees_capable(struct task_struct *tsk, const struct cred *cred,
 			    int cap,
 			    int audit);
 static int trustees_inode_permission(struct inode *inode, int mask);
+static int trustees_inode_setattr(struct dentry *dentry, struct iattr *attr);
 
 /* Checks if user has access to the inode due to root status
  */
@@ -243,6 +244,7 @@ static int trustees_inode_link(struct dentry *old_dentry,
 struct security_operations trustees_security_ops = {
 	.capable = trustees_capable,
 	.inode_permission = trustees_inode_permission,
+	.inode_setattr = trustees_inode_setattr,
 	.inode_link = trustees_inode_link,
 	.inode_rename = trustees_inode_rename
 };
@@ -341,6 +343,17 @@ out_path:
 	return ret;
 }
 
+static int trustees_inode_setattr(struct dentry *dentry, struct iattr *attr)
+{
+	unsigned int ia_valid = attr->ia_valid;
+	int ret = 0;
+	/* This covers the case of setting the inode time (CAP_FOWNER). */
+	if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)) {
+		ret = trustees_inode_permission(dentry->d_inode, MAY_WRITE);
+	}
+	return ret;
+}
+
 /* We should only allow hard links under one of two conditions:
  *   1. Its in the same trustee
  *        - if the two dentries are covered by the same trustee, there shouldn't
@@ -398,7 +411,7 @@ static int trustees_capable(struct task_struct *tsk, const struct cred *cred,
 			    int cap,
 			    int audit)
 {
-	if (cap == CAP_DAC_OVERRIDE)
+	if (cap == CAP_DAC_OVERRIDE || cap == CAP_FOWNER)
 		return 0;
 
 	return cap_capable(tsk, cred, cap, audit);