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

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

Merge branch 'bugfixes' of... 

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

* 'bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  integrity: add ima_counts_put (updated)
  integrity: ima audit hash_exists fix
  integrity: ima mq_open imbalance msg fix
parents e717f33e 94e5d714

fs/namei.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -1761,6 +1761,10 @@ struct file *do_filp_open(int dfd, const char *pathname, 
			goto exit;

			goto exit;

		}

		}

		filp = nameidata_to_filp(&nd, open_flag);

		filp = nameidata_to_filp(&nd, open_flag);

		if (IS_ERR(filp))

			ima_counts_put(&nd.path,

				       acc_mode & (MAY_READ | MAY_WRITE |

						   MAY_EXEC));

		mnt_drop_write(nd.path.mnt);

		mnt_drop_write(nd.path.mnt);

		if (nd.root.mnt)

		if (nd.root.mnt)

			path_put(&nd.root);

			path_put(&nd.root);
@@ -1817,6 +1821,9 @@ struct file *do_filp_open(int dfd, const char *pathname, 
		goto exit;

		goto exit;

	}

	}

	filp = nameidata_to_filp(&nd, open_flag);

	filp = nameidata_to_filp(&nd, open_flag);

	if (IS_ERR(filp))

		ima_counts_put(&nd.path,

			       acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));

	/*

	/*

	 * It is now safe to drop the mnt write

	 * It is now safe to drop the mnt write

	 * because the filp has had a write taken

	 * because the filp has had a write taken

include/linux/ima.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ extern int ima_path_check(struct path *path, int mask, int update_counts); 
extern void ima_file_free(struct file *file);

extern void ima_file_free(struct file *file);

extern int ima_file_mmap(struct file *file, unsigned long prot);

extern int ima_file_mmap(struct file *file, unsigned long prot);

extern void ima_counts_get(struct file *file);

extern void ima_counts_get(struct file *file);

extern void ima_counts_put(struct path *path, int mask);





#else

#else

static inline int ima_bprm_check(struct linux_binprm *bprm)

static inline int ima_bprm_check(struct linux_binprm *bprm)
@@ -60,5 +61,10 @@ static inline void ima_counts_get(struct file *file) 
{

{

	return;

	return;

}

}



static inline void ima_counts_put(struct path *path, int mask)

{

	return;

}

#endif /* CONFIG_IMA_H */

#endif /* CONFIG_IMA_H */

#endif /* _LINUX_IMA_H */
 
#endif /* _LINUX_IMA_H */

ipc/mqueue.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/nsproxy.h>

#include <linux/nsproxy.h>

#include <linux/pid.h>

#include <linux/pid.h>

#include <linux/ipc_namespace.h>

#include <linux/ipc_namespace.h>

#include <linux/ima.h>





#include <net/sock.h>

#include <net/sock.h>

#include "util.h"

#include "util.h"
@@ -733,6 +734,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode, 
		error = PTR_ERR(filp);

		error = PTR_ERR(filp);

		goto out_putfd;

		goto out_putfd;

	}

	}

	ima_counts_get(filp);





	fd_install(fd, filp);

	fd_install(fd, filp);

	goto out_upsem;

	goto out_upsem;

security/integrity/ima/ima_main.c

+28 −1
Original line number Original line Diff line number Diff line
@@ -238,7 +238,34 @@ static int process_measurement(struct file *file, const unsigned char *filename, 
}

}





/*

/*

 * ima_opens_get - increment file counts

 * ima_counts_put - decrement file counts

 *

 * File counts are incremented in ima_path_check. On file open

 * error, such as ETXTBSY, decrement the counts to prevent

 * unnecessary imbalance messages.

 */

void ima_counts_put(struct path *path, int mask)

{

	struct inode *inode = path->dentry->d_inode;

	struct ima_iint_cache *iint;



	if (!ima_initialized || !S_ISREG(inode->i_mode))

		return;

	iint = ima_iint_find_insert_get(inode);

	if (!iint)

		return;



	mutex_lock(&iint->mutex);

	iint->opencount--;

	if ((mask & MAY_WRITE) || (mask == 0))

		iint->writecount--;

	else if (mask & (MAY_READ | MAY_EXEC))

		iint->readcount--;

	mutex_unlock(&iint->mutex);

}



/*

 * ima_counts_get - increment file counts

 *

 *

 * - for IPC shm and shmat file.

 * - for IPC shm and shmat file.

 * - for nfsd exported files.

 * - for nfsd exported files.

security/integrity/ima/ima_queue.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -134,7 +134,8 @@ int ima_add_template_entry(struct ima_template_entry *entry, int violation, 
	}

	}

out:

out:

	mutex_unlock(&ima_extend_list_mutex);

	mutex_unlock(&ima_extend_list_mutex);

	integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode, entry->template_name,

	integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode,

			    entry->template.file_name,

			    op, audit_cause, result, audit_info);

			    op, audit_cause, result, audit_info);

	return result;

	return result;

}
 
}