[gentoo-commits] linux-patches r1353 - genpatches-2.6/trunk/2.6.27

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2008-10-11 01:09:49 +0000 (Sat, 11 Oct 2008)
New Revision: 1353

Removed:
   genpatches-2.6/trunk/2.6.27/1502_wan-sbni_ioctl-add-missing-capability-checks.patch
   genpatches-2.6/trunk/2.6.27/1900_UTC-timestamp-option.patch
   genpatches-2.6/trunk/2.6.27/2600_evdev-compat-ioctl-force-feedback.patch
Modified:
   genpatches-2.6/trunk/2.6.27/0000_README
Log:
More patches removed and updates to README

Modified: genpatches-2.6/trunk/2.6.27/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.27/0000_README	2008-10-11 00:03:51 UTC (rev 1352)
+++ genpatches-2.6/trunk/2.6.27/0000_README	2008-10-11 01:09:49 UTC (rev 1353)
@@ -39,46 +39,6 @@
 Individual Patch Descriptions:
 --------------------------------------------------------------------------
 
-Patch:  1000_linux-2.6.26.1.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.1
-
-Patch:  1001_linux-2.6.26.2.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.2
-
-Patch:  1002_linux-2.6.26.3.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.3
-
-Patch:  1003_linux-2.6.26.4.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.4
-
-Patch:  1004_linux-2.6.26.5.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.5
-
-Patch:  1005_linux-2.6.26.6.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.6
-
-Patch:  1502_wan-sbni_ioctl-add-missing-capability-checks.patch
-From:   http://www.kernel.org
-Desc:   Adds missing capability checks in drivers/net/wan/sbni.c -> sbni_ioctl()
-
-Patch:	1900_UTC-timestamp-option.patch
-From:	http://bugs.gentoo.org/233307
-Desc:	Fix to add UTC timestamp option
-
-Patch:	2600_evdev-compat-ioctl-force-feedback.patch
-From:	http://bugs.gentoo.org/214700
-Desc:	Fix evdev force feedback in 32-bit compat mode
-
-Patch:	2900_linux-2.6.27-makefile.patch
-From:	http://www.kernel.org
-Desc:	Makefile patch
-
 Patch:	4105_dm-bbr.patch
 From:	EVMS 2.5.2
 Desc:	Bad block relocation support for LiveCD users

Deleted: genpatches-2.6/trunk/2.6.27/1502_wan-sbni_ioctl-add-missing-capability-checks.patch
===================================================================
--- genpatches-2.6/trunk/2.6.27/1502_wan-sbni_ioctl-add-missing-capability-checks.patch	2008-10-11 00:03:51 UTC (rev 1352)
+++ genpatches-2.6/trunk/2.6.27/1502_wan-sbni_ioctl-add-missing-capability-checks.patch	2008-10-11 01:09:49 UTC (rev 1353)
@@ -1,79 +0,0 @@
-From: Eugene Teo <eugeneteo@××××××.sg>
-Date: Wed, 27 Aug 2008 11:50:30 +0000 (-0700)
-Subject: wan: Missing capability checks in sbni_ioctl()
-X-Git-Tag: v2.6.27-rc5~8^2~2
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f2455eb176ac87081bbfc9a44b21c7cd2bc1967e
-
-wan: Missing capability checks in sbni_ioctl()
-
-There are missing capability checks in the following code:
-
-1300 static int
-1301 sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd)
-1302 {
-[...]
-1319     case  SIOCDEVRESINSTATS :
-1320         if( current->euid != 0 )    /* root only */
-1321             return  -EPERM;
-[...]
-1336     case  SIOCDEVSHWSTATE :
-1337         if( current->euid != 0 )    /* root only */
-1338             return  -EPERM;
-[...]
-1357     case  SIOCDEVENSLAVE :
-1358         if( current->euid != 0 )    /* root only */
-1359             return  -EPERM;
-[...]
-1372     case  SIOCDEVEMANSIPATE :
-1373         if( current->euid != 0 )    /* root only */
-1374             return  -EPERM;
-
-Here's my proposed fix:
-
-Missing capability checks.
-
-Signed-off-by: Eugene Teo <eugeneteo@××××××.sg>
-Signed-off-by: David S. Miller <davem@×××××××××.net>
----
-
-diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
-index e59255a..6596cd0 100644
---- a/drivers/net/wan/sbni.c
-+++ b/drivers/net/wan/sbni.c
-@@ -1317,7 +1317,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
- 		break;
- 
- 	case  SIOCDEVRESINSTATS :
--		if( current->euid != 0 )	/* root only */
-+		if (!capable(CAP_NET_ADMIN))
- 			return  -EPERM;
- 		memset( &nl->in_stats, 0, sizeof(struct sbni_in_stats) );
- 		break;
-@@ -1334,7 +1334,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
- 		break;
- 
- 	case  SIOCDEVSHWSTATE :
--		if( current->euid != 0 )	/* root only */
-+		if (!capable(CAP_NET_ADMIN))
- 			return  -EPERM;
- 
- 		spin_lock( &nl->lock );
-@@ -1355,7 +1355,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
- #ifdef CONFIG_SBNI_MULTILINE
- 
- 	case  SIOCDEVENSLAVE :
--		if( current->euid != 0 )	/* root only */
-+		if (!capable(CAP_NET_ADMIN))
- 			return  -EPERM;
- 
- 		if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name ))
-@@ -1370,7 +1370,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
- 		return  enslave( dev, slave_dev );
- 
- 	case  SIOCDEVEMANSIPATE :
--		if( current->euid != 0 )	/* root only */
-+		if (!capable(CAP_NET_ADMIN))
- 			return  -EPERM;
- 
- 		return  emancipate( dev );
-

Deleted: genpatches-2.6/trunk/2.6.27/1900_UTC-timestamp-option.patch
===================================================================
--- genpatches-2.6/trunk/2.6.27/1900_UTC-timestamp-option.patch	2008-10-11 00:03:51 UTC (rev 1352)
+++ genpatches-2.6/trunk/2.6.27/1900_UTC-timestamp-option.patch	2008-10-11 01:09:49 UTC (rev 1353)
@@ -1,221 +0,0 @@
-New mount option ("tz=UTC") for FAT (vfat/msdos) filesystems allowing
-timestamps to be in coordinated universal time (UTC) rather than
-local time in applications where doing this is advantageous (like
-digital cameras, etc.)
-
-Signed-off-by: Joe Peterson <joe@×××××××.com>
-Acked-by: OGAWA Hirofumi <hirofumi@×××××××××××××××.jp>
----
-
-diff -puNr a/fs/fat/dir.c b/fs/fat/dir.c
---- a/fs/fat/dir.c	2008-06-25 08:53:35.676901351 -0600
-+++ b/fs/fat/dir.c	2008-06-26 12:58:56.096272279 -0600
-@@ -1082,7 +1082,7 @@ int fat_alloc_new_dir(struct inode *dir,
- 		goto error_free;
- 	}
- 
--	fat_date_unix2dos(ts->tv_sec, &time, &date);
-+	fat_date_unix2dos(ts->tv_sec, &time, &date, sbi->options.tz_utc);
- 
- 	de = (struct msdos_dir_entry *)bhs[0]->b_data;
- 	/* filling the new directory slots ("." and ".." entries) */
-diff -puNr a/fs/fat/inode.c b/fs/fat/inode.c
---- a/fs/fat/inode.c	2008-06-25 08:53:35.676901351 -0600
-+++ b/fs/fat/inode.c	2008-06-26 14:57:07.087942764 -0600
-@@ -382,17 +382,20 @@ static int fat_fill_inode(struct inode *
- 	inode->i_blocks = ((inode->i_size + (sbi->cluster_size - 1))
- 			   & ~((loff_t)sbi->cluster_size - 1)) >> 9;
- 	inode->i_mtime.tv_sec =
--		date_dos2unix(le16_to_cpu(de->time), le16_to_cpu(de->date));
-+		date_dos2unix(le16_to_cpu(de->time), le16_to_cpu(de->date),
-+			      sbi->options.tz_utc);
- 	inode->i_mtime.tv_nsec = 0;
- 	if (sbi->options.isvfat) {
- 		int secs = de->ctime_cs / 100;
- 		int csecs = de->ctime_cs % 100;
- 		inode->i_ctime.tv_sec  =
- 			date_dos2unix(le16_to_cpu(de->ctime),
--				      le16_to_cpu(de->cdate)) + secs;
-+				      le16_to_cpu(de->cdate),
-+				      sbi->options.tz_utc) + secs;
- 		inode->i_ctime.tv_nsec = csecs * 10000000;
- 		inode->i_atime.tv_sec =
--			date_dos2unix(0, le16_to_cpu(de->adate));
-+			date_dos2unix(0, le16_to_cpu(de->adate),
-+				      sbi->options.tz_utc);
- 		inode->i_atime.tv_nsec = 0;
- 	} else
- 		inode->i_ctime = inode->i_atime = inode->i_mtime;
-@@ -592,11 +595,14 @@ retry:
- 	raw_entry->attr = fat_attr(inode);
- 	raw_entry->start = cpu_to_le16(MSDOS_I(inode)->i_logstart);
- 	raw_entry->starthi = cpu_to_le16(MSDOS_I(inode)->i_logstart >> 16);
--	fat_date_unix2dos(inode->i_mtime.tv_sec, &raw_entry->time, &raw_entry->date);
-+	fat_date_unix2dos(inode->i_mtime.tv_sec, &raw_entry->time,
-+			  &raw_entry->date, sbi->options.tz_utc);
- 	if (sbi->options.isvfat) {
- 		__le16 atime;
--		fat_date_unix2dos(inode->i_ctime.tv_sec,&raw_entry->ctime,&raw_entry->cdate);
--		fat_date_unix2dos(inode->i_atime.tv_sec,&atime,&raw_entry->adate);
-+		fat_date_unix2dos(inode->i_ctime.tv_sec, &raw_entry->ctime,
-+				  &raw_entry->cdate, sbi->options.tz_utc);
-+		fat_date_unix2dos(inode->i_atime.tv_sec, &atime,
-+				  &raw_entry->adate, sbi->options.tz_utc);
- 		raw_entry->ctime_cs = (inode->i_ctime.tv_sec & 1) * 100 +
- 			inode->i_ctime.tv_nsec / 10000000;
- 	}
-@@ -836,6 +842,8 @@ static int fat_show_options(struct seq_f
- 	}
- 	if (sbi->options.flush)
- 		seq_puts(m, ",flush");
-+	if (opts->tz_utc)
-+		seq_puts(m, ",tz=UTC");
- 
- 	return 0;
- }
-@@ -848,7 +856,7 @@ enum {
- 	Opt_charset, Opt_shortname_lower, Opt_shortname_win95,
- 	Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
- 	Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
--	Opt_obsolate, Opt_flush, Opt_err,
-+	Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_err,
- };
- 
- static match_table_t fat_tokens = {
-@@ -883,6 +891,7 @@ static match_table_t fat_tokens = {
- 	{Opt_obsolate, "cvf_options=%100s"},
- 	{Opt_obsolate, "posix"},
- 	{Opt_flush, "flush"},
-+	{Opt_tz_utc, "tz=UTC"},
- 	{Opt_err, NULL},
- };
- static match_table_t msdos_tokens = {
-@@ -947,6 +956,7 @@ static int parse_options(char *options, 
- 	opts->utf8 = opts->unicode_xlate = 0;
- 	opts->numtail = 1;
- 	opts->usefree = opts->nocase = 0;
-+	opts->tz_utc = 0;
- 	*debug = 0;
- 
- 	if (!options)
-@@ -1036,6 +1046,9 @@ static int parse_options(char *options, 
- 		case Opt_flush:
- 			opts->flush = 1;
- 			break;
-+		case Opt_tz_utc:
-+			opts->tz_utc = 1;
-+			break;
- 
- 		/* msdos specific */
- 		case Opt_dots:
-diff -puNr a/fs/fat/misc.c b/fs/fat/misc.c
---- a/fs/fat/misc.c	2008-06-25 08:53:35.676901351 -0600
-+++ b/fs/fat/misc.c	2008-06-26 12:59:08.627376422 -0600
-@@ -142,7 +142,7 @@ static int day_n[] = {
- };
- 
- /* Convert a MS-DOS time/date pair to a UNIX date (seconds since 1 1 70). */
--int date_dos2unix(unsigned short time, unsigned short date)
-+int date_dos2unix(unsigned short time, unsigned short date, int tz_utc)
- {
- 	int month, year, secs;
- 
-@@ -156,16 +156,18 @@ int date_dos2unix(unsigned short time, u
- 	    ((date & 31)-1+day_n[month]+(year/4)+year*365-((year & 3) == 0 &&
- 	    month < 2 ? 1 : 0)+3653);
- 			/* days since 1.1.70 plus 80's leap day */
--	secs += sys_tz.tz_minuteswest*60;
-+	if (!tz_utc)
-+		secs += sys_tz.tz_minuteswest*60;
- 	return secs;
- }
- 
- /* Convert linear UNIX date to a MS-DOS time/date pair. */
--void fat_date_unix2dos(int unix_date, __le16 *time, __le16 *date)
-+void fat_date_unix2dos(int unix_date, __le16 *time, __le16 *date, int tz_utc)
- {
- 	int day, year, nl_day, month;
- 
--	unix_date -= sys_tz.tz_minuteswest*60;
-+	if (!tz_utc)
-+		unix_date -= sys_tz.tz_minuteswest*60;
- 
- 	/* Jan 1 GMT 00:00:00 1980. But what about another time zone? */
- 	if (unix_date < 315532800)
-diff -puNr a/fs/msdos/namei.c b/fs/msdos/namei.c
---- a/fs/msdos/namei.c	2008-06-25 08:53:35.696902410 -0600
-+++ b/fs/msdos/namei.c	2008-06-26 12:58:42.255055811 -0600
-@@ -243,6 +243,7 @@ static int msdos_add_entry(struct inode 
- 			   int is_dir, int is_hid, int cluster,
- 			   struct timespec *ts, struct fat_slot_info *sinfo)
- {
-+	struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb);
- 	struct msdos_dir_entry de;
- 	__le16 time, date;
- 	int err;
-@@ -252,7 +253,7 @@ static int msdos_add_entry(struct inode 
- 	if (is_hid)
- 		de.attr |= ATTR_HIDDEN;
- 	de.lcase = 0;
--	fat_date_unix2dos(ts->tv_sec, &time, &date);
-+	fat_date_unix2dos(ts->tv_sec, &time, &date, sbi->options.tz_utc);
- 	de.cdate = de.adate = 0;
- 	de.ctime = 0;
- 	de.ctime_cs = 0;
-diff -puNr a/fs/vfat/namei.c b/fs/vfat/namei.c
---- a/fs/vfat/namei.c	2008-06-25 08:53:35.686902663 -0600
-+++ b/fs/vfat/namei.c	2008-06-26 12:58:27.073724049 -0600
-@@ -621,7 +621,7 @@ shortname:
- 	memcpy(de->name, msdos_name, MSDOS_NAME);
- 	de->attr = is_dir ? ATTR_DIR : ATTR_ARCH;
- 	de->lcase = lcase;
--	fat_date_unix2dos(ts->tv_sec, &time, &date);
-+	fat_date_unix2dos(ts->tv_sec, &time, &date, sbi->options.tz_utc);
- 	de->time = de->ctime = time;
- 	de->date = de->cdate = de->adate = date;
- 	de->ctime_cs = 0;
-diff -puNr a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
---- a/include/linux/msdos_fs.h	2008-06-25 08:53:17.435303045 -0600
-+++ b/include/linux/msdos_fs.h	2008-06-26 14:58:40.626135522 -0600
-@@ -205,7 +205,8 @@ struct fat_mount_options {
- 		 atari:1,         /* Use Atari GEMDOS variation of MS-DOS fs */
- 		 flush:1,	  /* write things quickly */
- 		 nocase:1,	  /* Does this need case conversion? 0=need case conversion*/
--		 usefree:1;	  /* Use free_clusters for FAT32 */
-+		 usefree:1,	  /* Use free_clusters for FAT32 */
-+		 tz_utc:1;	  /* Filesystem timestamps are in UTC */
- };
- 
- #define FAT_HASH_BITS	8
-@@ -428,8 +429,9 @@ extern int fat_flush_inodes(struct super
- extern void fat_fs_panic(struct super_block *s, const char *fmt, ...);
- extern void fat_clusters_flush(struct super_block *sb);
- extern int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster);
--extern int date_dos2unix(unsigned short time, unsigned short date);
--extern void fat_date_unix2dos(int unix_date, __le16 *time, __le16 *date);
-+extern int date_dos2unix(unsigned short time, unsigned short date, int tz_utc);
-+extern void fat_date_unix2dos(int unix_date, __le16 *time, __le16 *date,
-+			      int tz_utc);
- extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs);
- 
- int fat_cache_init(void);
-
-diff -puN Documentation/filesystems/vfat.txt~utc-timestamp-option-for-fat-filesystems-fix Documentation/filesystems/vfat.txt
---- a/Documentation/filesystems/vfat.txt~utc-timestamp-option-for-fat-filesystems-fix
-+++ a/Documentation/filesystems/vfat.txt
-@@ -96,6 +96,14 @@ shortname=lower|win95|winnt|mixed
- 			emulate the Windows 95 rule for create.
- 		 Default setting is `lower'.
- 
-+tz=UTC        -- Interpret timestamps as UTC rather than local time.
-+                 This option disables the conversion of timestamps
-+                 between local time (as used by Windows on FAT) and UTC
-+                 (which Linux uses internally).  This is particuluarly
-+                 useful when mounting devices (like digital cameras)
-+                 that are set to UTC in order to avoid the pitfalls of
-+                 local time.
-+
- <bool>: 0,1,yes,no,true,false
- 
- TODO
-

Deleted: genpatches-2.6/trunk/2.6.27/2600_evdev-compat-ioctl-force-feedback.patch
===================================================================
--- genpatches-2.6/trunk/2.6.27/2600_evdev-compat-ioctl-force-feedback.patch	2008-10-11 00:03:51 UTC (rev 1352)
+++ genpatches-2.6/trunk/2.6.27/2600_evdev-compat-ioctl-force-feedback.patch	2008-10-11 01:09:49 UTC (rev 1353)
@@ -1,159 +0,0 @@
-From: Adam Dawidowski <drake_ster@××.pl>
-Date: Mon, 2 Jun 2008 05:08:10 +0000 (-0400)
-Subject: Input: fix force feedback upload issue in compat mode
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=bb00421d9b684253468bf751e7ce0a4667b721e8
-
-Input: fix force feedback upload issue in compat mode
-
-Force feedback upload of effects through the event device (ioctl
-EVIOCSFF) is not working in 32 bit applications running on 64-bit
-kernel due to the fact that struct ff_effect contains a pointer,
-resulting in the structure having different sizes in 64 and 32 bit
-programs and causing difference in ioctl numbers.
-
-[dtor@××××.ru: refactor to keep all ugliness in evdev]
-
-Signed-off-by: Adam Dawidowski <drake_ster@××.pl>
-Signed-off-by: Dmitry Torokhov <dtor@××××.ru>
----
-
-diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
-index b32984b..2d65411 100644
---- a/drivers/input/evdev.c
-+++ b/drivers/input/evdev.c
-@@ -300,6 +300,35 @@ struct input_event_compat {
- 	__s32 value;
- };
- 
-+struct ff_periodic_effect_compat {
-+	__u16 waveform;
-+	__u16 period;
-+	__s16 magnitude;
-+	__s16 offset;
-+	__u16 phase;
-+
-+	struct ff_envelope envelope;
-+
-+	__u32 custom_len;
-+	compat_uptr_t custom_data;
-+};
-+
-+struct ff_effect_compat {
-+	__u16 type;
-+	__s16 id;
-+	__u16 direction;
-+	struct ff_trigger trigger;
-+	struct ff_replay replay;
-+
-+	union {
-+		struct ff_constant_effect constant;
-+		struct ff_ramp_effect ramp;
-+		struct ff_periodic_effect_compat periodic;
-+		struct ff_condition_effect condition[2]; /* One for each axis */
-+		struct ff_rumble_effect rumble;
-+	} u;
-+};
-+
- /* Note to the author of this code: did it ever occur to
-    you why the ifdefs are needed? Think about it again. -AK */
- #ifdef CONFIG_X86_64
-@@ -368,6 +397,42 @@ static int evdev_event_to_user(char __user *buffer,
- 	return 0;
- }
- 
-+static int evdev_ff_effect_from_user(const char __user *buffer, size_t size,
-+				     struct ff_effect *effect)
-+{
-+	if (COMPAT_TEST) {
-+		struct ff_effect_compat *compat_effect;
-+
-+		if (size != sizeof(struct ff_effect_compat))
-+			return -EINVAL;
-+
-+		/*
-+		 * It so happens that the pointer which needs to be changed
-+		 * is the last field in the structure, so we can copy the
-+		 * whole thing and replace just the pointer.
-+		 */
-+
-+		compat_effect = (struct ff_effect_compat *)effect;
-+
-+		if (copy_from_user(compat_effect, buffer,
-+				   sizeof(struct ff_effect_compat)))
-+			return -EFAULT;
-+
-+		if (compat_effect->type == FF_PERIODIC &&
-+		    compat_effect->u.periodic.waveform == FF_CUSTOM)
-+			effect->u.periodic.custom_data =
-+				compat_ptr(compat_effect->u.periodic.custom_data);
-+	} else {
-+		if (size != sizeof(struct ff_effect))
-+			return -EINVAL;
-+
-+		if (copy_from_user(effect, buffer, sizeof(struct ff_effect)))
-+			return -EFAULT;
-+	}
-+
-+	return 0;
-+}
-+
- #else
- 
- static inline size_t evdev_event_size(void)
-@@ -393,6 +458,18 @@ static int evdev_event_to_user(char __user *buffer,
- 	return 0;
- }
- 
-+static int evdev_ff_effect_from_user(const char __user *buffer, size_t size,
-+				     struct ff_effect *effect)
-+{
-+	if (size != sizeof(struct ff_effect))
-+		return -EINVAL;
-+
-+	if (copy_from_user(effect, buffer, sizeof(struct ff_effect)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
- #endif /* CONFIG_COMPAT */
- 
- static ssize_t evdev_write(struct file *file, const char __user *buffer,
-@@ -633,17 +710,6 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
- 
- 		return input_set_keycode(dev, t, v);
- 
--	case EVIOCSFF:
--		if (copy_from_user(&effect, p, sizeof(effect)))
--			return -EFAULT;
--
--		error = input_ff_upload(dev, &effect, file);
--
--		if (put_user(effect.id, &(((struct ff_effect __user *)p)->id)))
--			return -EFAULT;
--
--		return error;
--
- 	case EVIOCRMFF:
- 		return input_ff_erase(dev, (int)(unsigned long) p, file);
- 
-@@ -733,6 +799,19 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
- 
- 		if (_IOC_DIR(cmd) == _IOC_WRITE) {
- 
-+			if (_IOC_NR(cmd) == _IOC_NR(EVIOCSFF)) {
-+
-+				if (evdev_ff_effect_from_user(p, _IOC_SIZE(cmd), &effect))
-+					return -EFAULT;
-+
-+				error = input_ff_upload(dev, &effect, file);
-+
-+				if (put_user(effect.id, &(((struct ff_effect __user *)p)->id)))
-+					return -EFAULT;
-+
-+				return error;
-+			}
-+
- 			if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {
- 
- 				t = _IOC_NR(cmd) & ABS_MAX;