Unverified Commit 1f36aadf authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6607 [sync] PR-6579: media: rc: bpf attach/detach requires write permission 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/6579 
 
PR sync from: Zhenzeng Su <suzhenzeng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JTLMEO4XWJMG3UHUIXGV5EWSWBH6BCUJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HJVU 
 
Link:https://gitee.com/openeuler/kernel/pulls/6607

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 09f98bc0 bade7092

drivers/media/rc/bpf-lirc.c

+3 −3
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int lirc_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog) 
	if (attr->attach_flags)

		return -EINVAL;



	rcdev = rc_dev_get_from_fd(attr->target_fd);

	rcdev = rc_dev_get_from_fd(attr->target_fd, true);

	if (IS_ERR(rcdev))

		return PTR_ERR(rcdev);
@@ -274,7 +274,7 @@ int lirc_prog_detach(const union bpf_attr *attr) 
	if (IS_ERR(prog))

		return PTR_ERR(prog);



	rcdev = rc_dev_get_from_fd(attr->target_fd);

	rcdev = rc_dev_get_from_fd(attr->target_fd, true);

	if (IS_ERR(rcdev)) {

		bpf_prog_put(prog);

		return PTR_ERR(rcdev);
@@ -299,7 +299,7 @@ int lirc_prog_query(const union bpf_attr *attr, union bpf_attr __user *uattr) 
	if (attr->query.query_flags)

		return -EINVAL;



	rcdev = rc_dev_get_from_fd(attr->query.target_fd);

	rcdev = rc_dev_get_from_fd(attr->query.target_fd, false);

	if (IS_ERR(rcdev))

		return PTR_ERR(rcdev);

drivers/media/rc/lirc_dev.c

+4 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ void __exit lirc_dev_exit(void) 
	unregister_chrdev_region(lirc_base_dev, RC_DEV_MAX);

}



struct rc_dev *rc_dev_get_from_fd(int fd)

struct rc_dev *rc_dev_get_from_fd(int fd, bool write)

{

	struct fd f = fdget(fd);

	struct lirc_fh *fh;
@@ -836,6 +836,9 @@ struct rc_dev *rc_dev_get_from_fd(int fd) 
		return ERR_PTR(-EINVAL);

	}



	if (write && !(f.file->f_mode & FMODE_WRITE))

		return ERR_PTR(-EPERM);



	fh = f.file->private_data;

	dev = fh->rc;

drivers/media/rc/rc-core-priv.h

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ void lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev); 
void lirc_scancode_event(struct rc_dev *dev, struct lirc_scancode *lsc);

int lirc_register(struct rc_dev *dev);

void lirc_unregister(struct rc_dev *dev);

struct rc_dev *rc_dev_get_from_fd(int fd);

struct rc_dev *rc_dev_get_from_fd(int fd, bool write);

#else

static inline int lirc_dev_init(void) { return 0; }

static inline void lirc_dev_exit(void) {}