patch-1.3.15 linux/fs/block_dev.c

• Lines: 19
• Date: Tue Aug 1 10:05:54 1995
• Orig file: v1.3.14/linux/fs/block_dev.c
• Orig date: Tue Jun 27 14:11:38 1995

diff -u --recursive --new-file v1.3.14/linux/fs/block_dev.c linux/fs/block_dev.c
@@ -20,7 +20,7 @@
 #define MAX_BUF_PER_PAGE (PAGE_SIZE / 512)
 #define NBUF 64
 
-int block_write(struct inode * inode, struct file * filp, char * buf, int count)
+int block_write(struct inode * inode, struct file * filp, const char * buf, int count)
 {
 	int blocksize, blocksize_bits, i, j, buffercount,write_error;
 	int block, blocks;
@@ -197,6 +197,9 @@
 
 	if (offset > size)
 		left = 0;
+	/* size - offset might not fit into left, so check explicitly. */
+	else if (size - offset > INT_MAX)
+		left = INT_MAX;
 	else
 		left = size - offset;
 	if (left > count)