X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fs390%2Fchar%2Ftape_char.c;h=0d0343b87a007697f55d9fe6c5e05f4b4ce8d9c2;hb=3e3ff47c8527c5ba0be4e9f358d49e4b076bd6ef;hp=86262a13f7c60d0d4040492bea19295155cb360a;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 86262a13f..0d0343b87 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -145,6 +145,16 @@ tapechar_read(struct file *filp, char __user *data, size_t count, loff_t *ppos)
 
 	DBF_EVENT(6, "TCHAR:read\n");
 	device = (struct tape_device *) filp->private_data;
+	/* Check position. */
+	if (ppos != &filp->f_pos) {
+		/*
+		 * "A request was outside the capabilities of the device."
+		 * This check uses internal knowledge about how pread and
+		 * read work...
+		 */
+		DBF_EVENT(6, "TCHAR:ppos wrong\n");
+		return -EOVERFLOW;
+	}
 
 	/*
 	 * If the tape isn't terminated yet, do it now. And since we then
@@ -211,6 +221,12 @@ tapechar_write(struct file *filp, const char __user *data, size_t count, loff_t
 
 	DBF_EVENT(6, "TCHAR:write\n");
 	device = (struct tape_device *) filp->private_data;
+	/* Check position */
+	if (ppos != &filp->f_pos) {
+		/* "A request was outside the capabilities of the device." */
+		DBF_EVENT(6, "TCHAR:ppos wrong\n");
+		return -EOVERFLOW;
+	}
 	/* Find out block size and number of blocks */
 	if (device->char_data.block_size != 0) {
 		if (count < device->char_data.block_size) {
@@ -313,7 +329,7 @@ tapechar_open (struct inode *inode, struct file *filp)
 	rc = tape_open(device);
 	if (rc == 0) {
 		filp->private_data = device;
-		return nonseekable_open(inode, filp);
+		return 0;
 	}
 	tape_put_device(device);