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

Commit f6fd5c84 authored by James Morris's avatar James Morris
Browse files

Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next

parents ed3c4f8f 5a9196d7

Documentation/ABI/testing/ima_policy

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Description: 
			option:	[[appraise_type=]] [permit_directio]



		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]

				[FIRMWARE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
@@ -57,7 +58,8 @@ Description: 
			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=FILE_CHECK mask=MAY_READ uid=0

			measure func=MODULE_CHECK uid=0

			measure func=MODULE_CHECK

			measure func=FIRMWARE_CHECK

			appraise fowner=0



		The default policy measures all executables in bprm_check,

drivers/base/firmware_class.c

+26 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/suspend.h>

#include <linux/syscore_ops.h>

#include <linux/reboot.h>

#include <linux/security.h>



#include <generated/utsrelease.h>
@@ -308,12 +309,17 @@ static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) 
	if (rc != size) {

		if (rc > 0)

			rc = -EIO;

		vfree(buf);

		return rc;

		goto fail;

	}

	rc = security_kernel_fw_from_file(file, buf, size);

	if (rc)

		goto fail;

	fw_buf->data = buf;

	fw_buf->size = size;

	return 0;

fail:

	vfree(buf);

	return rc;

}



static int fw_get_filesystem_firmware(struct device *device,
@@ -617,6 +623,7 @@ static ssize_t firmware_loading_store(struct device *dev, 
{

	struct firmware_priv *fw_priv = to_firmware_priv(dev);

	struct firmware_buf *fw_buf;

	ssize_t written = count;

	int loading = simple_strtol(buf, NULL, 10);

	int i;
@@ -640,6 +647,8 @@ static ssize_t firmware_loading_store(struct device *dev, 
		break;

	case 0:

		if (test_bit(FW_STATUS_LOADING, &fw_buf->status)) {

			int rc;



			set_bit(FW_STATUS_DONE, &fw_buf->status);

			clear_bit(FW_STATUS_LOADING, &fw_buf->status);
@@ -649,10 +658,23 @@ static ssize_t firmware_loading_store(struct device *dev, 
			 * see the mapped 'buf->data' once the loading

			 * is completed.

			 * */

			if (fw_map_pages_buf(fw_buf))

			rc = fw_map_pages_buf(fw_buf);

			if (rc)

				dev_err(dev, "%s: map pages failed\n",

					__func__);

			else

				rc = security_kernel_fw_from_file(NULL,

						fw_buf->data, fw_buf->size);



			/*

			 * Same logic as fw_load_abort, only the DONE bit

			 * is ignored and we set ABORT only on failure.

			 */

			list_del_init(&fw_buf->pending_list);

			if (rc) {

				set_bit(FW_STATUS_ABORT, &fw_buf->status);

				written = rc;

			}

			complete_all(&fw_buf->completion);

			break;

		}
@@ -666,7 +688,7 @@ static ssize_t firmware_loading_store(struct device *dev, 
	}

out:

	mutex_unlock(&fw_lock);

	return count;

	return written;

}



static DEVICE_ATTR(loading, 0644, firmware_loading_show, firmware_loading_store);

include/linux/ima.h

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ extern int ima_file_check(struct file *file, int mask); 
extern void ima_file_free(struct file *file);

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

extern int ima_module_check(struct file *file);

extern int ima_fw_from_file(struct file *file, char *buf, size_t size);



#else

static inline int ima_bprm_check(struct linux_binprm *bprm)
@@ -46,6 +47,11 @@ static inline int ima_module_check(struct file *file) 
	return 0;

}



static inline int ima_fw_from_file(struct file *file, char *buf, size_t size)

{

	return 0;

}



#endif /* CONFIG_IMA */



#ifdef CONFIG_IMA_APPRAISE

include/linux/security.h

+17 −0
Original line number Diff line number Diff line
@@ -702,6 +702,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	@inode points to the inode to use as a reference.

 *	The current task must be the one that nominated @inode.

 *	Return 0 if successful.

 * @kernel_fw_from_file:

 *	Load firmware from userspace (not called for built-in firmware).

 *	@file contains the file structure pointing to the file containing

 *	the firmware to load. This argument will be NULL if the firmware

 *	was loaded via the uevent-triggered blob-based interface exposed

 *	by CONFIG_FW_LOADER_USER_HELPER.

 *	@buf pointer to buffer containing firmware contents.

 *	@size length of the firmware contents.

 *	Return 0 if permission is granted.

 * @kernel_module_request:

 *	Ability to trigger the kernel to automatically upcall to userspace for

 *	userspace to load a kernel module with the given name.
@@ -1568,6 +1577,7 @@ struct security_operations { 
	void (*cred_transfer)(struct cred *new, const struct cred *old);

	int (*kernel_act_as)(struct cred *new, u32 secid);

	int (*kernel_create_files_as)(struct cred *new, struct inode *inode);

	int (*kernel_fw_from_file)(struct file *file, char *buf, size_t size);

	int (*kernel_module_request)(char *kmod_name);

	int (*kernel_module_from_file)(struct file *file);

	int (*task_fix_setuid) (struct cred *new, const struct cred *old,
@@ -1840,6 +1850,7 @@ int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp); 
void security_transfer_creds(struct cred *new, const struct cred *old);

int security_kernel_act_as(struct cred *new, u32 secid);

int security_kernel_create_files_as(struct cred *new, struct inode *inode);

int security_kernel_fw_from_file(struct file *file, char *buf, size_t size);

int security_kernel_module_request(char *kmod_name);

int security_kernel_module_from_file(struct file *file);

int security_task_fix_setuid(struct cred *new, const struct cred *old,
@@ -2366,6 +2377,12 @@ static inline int security_kernel_create_files_as(struct cred *cred, 
	return 0;

}



static inline int security_kernel_fw_from_file(struct file *file,

					       char *buf, size_t size)

{

	return 0;

}



static inline int security_kernel_module_request(char *kmod_name)

{

	return 0;

security/capability.c

+6 −0
Original line number Diff line number Diff line
@@ -401,6 +401,11 @@ static int cap_kernel_create_files_as(struct cred *new, struct inode *inode) 
	return 0;

}



static int cap_kernel_fw_from_file(struct file *file, char *buf, size_t size)

{

	return 0;

}



static int cap_kernel_module_request(char *kmod_name)

{

	return 0;
@@ -1015,6 +1020,7 @@ void __init security_fixup_ops(struct security_operations *ops) 
	set_to_cap_if_null(ops, cred_transfer);

	set_to_cap_if_null(ops, kernel_act_as);

	set_to_cap_if_null(ops, kernel_create_files_as);

	set_to_cap_if_null(ops, kernel_fw_from_file);

	set_to_cap_if_null(ops, kernel_module_request);

	set_to_cap_if_null(ops, kernel_module_from_file);

	set_to_cap_if_null(ops, task_fix_setuid);