Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce0cfd4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  ima: hashing large files bug fix
  kernel_read: redefine offset type
parents 637952ca 16bfa38b

fs/exec.c

+2 −2
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ exit: 
}

EXPORT_SYMBOL(open_exec);



int kernel_read(struct file *file, unsigned long offset,

int kernel_read(struct file *file, loff_t offset,

		char *addr, unsigned long count)

{

	mm_segment_t old_fs;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2123,7 +2123,7 @@ extern struct file *do_filp_open(int dfd, const char *pathname, 
		int open_flag, int mode, int acc_mode);

extern int may_open(struct path *, int, int);



extern int kernel_read(struct file *, unsigned long, char *, unsigned long);

extern int kernel_read(struct file *, loff_t, char *, unsigned long);

extern struct file * open_exec(const char *);

 

/* fs/dcache.c -- generic fs support functions */

security/integrity/ima/ima_crypto.c

+4 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ int ima_calc_hash(struct file *file, char *digest) 
{

	struct hash_desc desc;

	struct scatterlist sg[1];

	loff_t i_size;

	loff_t i_size, offset = 0;

	char *rbuf;

	int rc, offset = 0;

	int rc;



	rc = init_desc(&desc);

	if (rc != 0)
@@ -67,6 +67,8 @@ int ima_calc_hash(struct file *file, char *digest) 
			rc = rbuf_len;

			break;

		}

		if (rbuf_len == 0)

			break;

		offset += rbuf_len;

		sg_init_one(sg, rbuf, rbuf_len);