Changeset 935

Timestamp:

08/03/08 22:52:13 (5 months ago)

Author:

mariodebian

Message:

unionfs-tcos (1.0.2.6.26.tcos2)

• Fix vfs_splice_from, vfs_splice_to and rw_verify_area (file.c)
• Move test target in Makefile to bottom

Location:

trunk/unionfs-tcos

Files:

• 2.6.26/Module.symvers (deleted)
• 2.6.26/file.c (modified) (1 diff)
• 2.6.26/main.c (modified) (1 diff)
• 2.6.26/modules.order (deleted)
• 2.6.26/union.h (modified) (1 diff)
• Makefile (modified) (2 diffs)
• debian/changelog (modified) (1 diff)

trunk/unionfs-tcos/2.6.26/file.c

@@ -18 +18 @@
 
 #include "union.h"
+#include <linux/splice.h>
+
+int security_file_permission (struct file *file, int mask)
+{
+        return 0;
+}
+
+#define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)
+
+int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count)
+{
+        struct inode *inode;
+        loff_t pos;
+        int retval = -EINVAL;
+
+        inode = file->f_path.dentry->d_inode;
+        if (unlikely((ssize_t) count < 0))
+                return retval;
+        pos = *ppos;
+        if (unlikely((pos < 0) || (loff_t) (pos + count) < 0))
+                return retval;
+
+        if (unlikely(inode->i_flock && mandatory_lock(inode))) {
+                retval = locks_mandatory_area(
+                        read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
+                        inode, file, pos, count);
+                if (retval < 0)
+                        return retval;
+        }
+        retval = security_file_permission(file,
+                                read_write == READ ? MAY_READ : MAY_WRITE);
+        if (retval)
+                return retval;
+        return count > MAX_RW_COUNT ? MAX_RW_COUNT : count;
+}
+
+long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out,
+                     loff_t *ppos, size_t len, unsigned int flags)
+{
+        int ret;
+
+        if (unlikely(!out->f_op || !out->f_op->splice_write))
+                return -EINVAL;
+
+        if (unlikely(!(out->f_mode & FMODE_WRITE)))
+                return -EBADF;
+
+        ret = rw_verify_area(WRITE, out, ppos, len);
+        if (unlikely(ret < 0))
+                return ret;
+
+        return out->f_op->splice_write(pipe, out, ppos, len, flags);
+}
+
+long vfs_splice_to(struct file *in, loff_t *ppos,
+                   struct pipe_inode_info *pipe, size_t len,
+                   unsigned int flags)
+{
+        int ret;
+
+        if (unlikely(!in->f_op || !in->f_op->splice_read))
+                return -EINVAL;
+
+        if (unlikely(!(in->f_mode & FMODE_READ)))
+                return -EBADF;
+
+        ret = rw_verify_area(READ, in, ppos, len);
+        if (unlikely(ret < 0))
+                return ret;
+
+        return in->f_op->splice_read(in, ppos, pipe, len, flags);
+}
 
 static ssize_t unionfs_read(struct file *file, char __user *buf,

trunk/unionfs-tcos/2.6.26/main.c

@@ -20 +20 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+
+
 
 static void unionfs_fill_inode(struct dentry *dentry,

trunk/unionfs-tcos/2.6.26/union.h

@@ -53 +53 @@
 #include "linux/union_fs.h"
 
-long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out,
-                    loff_t *ppos, size_t len, unsigned int flags);
-long vfs_splice_to(struct file *in, loff_t *ppos,
-                  struct pipe_inode_info *pipe, size_t len,
-                  unsigned int flags);
 #define UNIONFS_SUPER_MAGIC 0xf15f083d
 

trunk/unionfs-tcos/Makefile

@@ -8 +8 @@
 MODVERSION=$(shell echo $(KVER) | awk -F"-" '{print $$1}')
 SRCPATH=$(shell if [ -d $(CURDIR)/$(MODVERSION) ]; then echo $(CURDIR)/$(MODVERSION); else echo $(CURDIR)/build; fi)
-
-test:
-        @echo KVER=$(MODVERSION)
-        @echo SRCPATH=$(SRCPATH)
 
 modules:
@@ -26 +22 @@
 
 modulesclean:
-        CFLAGS="$(CFLAGS)" make -C $(KDIR) SUBDIRS=`pwd`/build2 CONFIG_UNION_FS=m $(DBG_CONFIG) CC="${CROSS_COMPILE}gcc" clean
+        CFLAGS="$(CFLAGS)" make -C $(KDIR) SUBDIRS=$(SRCPATH) CONFIG_UNION_FS=m $(DBG_CONFIG) CC="${CROSS_COMPILE}gcc" clean
+
+test:
+        @echo KVER=$(MODVERSION)
+        @echo SRCPATH=$(SRCPATH)
+

trunk/unionfs-tcos/debian/changelog

@@ +1 @@
+unionfs-tcos (1.0.2.6.26.tcos2) unstable; urgency=low
+
+  * Fix vfs_splice_from, vfs_splice_to and rw_verify_area (file.c)
+  * Move test target in Makefile to bottom
+
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Sun, 03 Aug 2008 22:51:46 +0200
+
 unionfs-tcos (1.0.2.6.26.tcos1) unstable; urgency=low