Skip to content

Commit d18ce5b

Browse files
author
CKI KWF Bot
committed
Merge: nbd: override creds to kernel when calling sock_{send,recv}msg()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1668 nbd: override creds to kernel when calling sock_{send,recv}msg() JIRA: https://issues.redhat.com/browse/RHEL-124544 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: John Meneghini <jmeneghi@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 9669822 + 9dbe32b commit d18ce5b

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

drivers/block/nbd.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
static DEFINE_IDR(nbd_index_idr);
5353
static DEFINE_MUTEX(nbd_index_mutex);
5454
static struct workqueue_struct *nbd_del_wq;
55+
static struct cred *nbd_cred;
5556
static int nbd_total_devices = 0;
5657

5758
struct nbd_sock {
@@ -554,6 +555,7 @@ static int __sock_xmit(struct nbd_device *nbd, struct socket *sock, int send,
554555
int result;
555556
struct msghdr msg = {} ;
556557
unsigned int noreclaim_flag;
558+
const struct cred *old_cred;
557559

558560
if (unlikely(!sock)) {
559561
dev_err_ratelimited(disk_to_dev(nbd->disk),
@@ -562,6 +564,8 @@ static int __sock_xmit(struct nbd_device *nbd, struct socket *sock, int send,
562564
return -EINVAL;
563565
}
564566

567+
old_cred = override_creds(nbd_cred);
568+
565569
msg.msg_iter = *iter;
566570

567571
noreclaim_flag = memalloc_noreclaim_save();
@@ -586,6 +590,8 @@ static int __sock_xmit(struct nbd_device *nbd, struct socket *sock, int send,
586590

587591
memalloc_noreclaim_restore(noreclaim_flag);
588592

593+
revert_creds(old_cred);
594+
589595
return result;
590596
}
591597

@@ -2677,7 +2683,15 @@ static int __init nbd_init(void)
26772683
return -ENOMEM;
26782684
}
26792685

2686+
nbd_cred = prepare_kernel_cred(&init_task);
2687+
if (!nbd_cred) {
2688+
destroy_workqueue(nbd_del_wq);
2689+
unregister_blkdev(NBD_MAJOR, "nbd");
2690+
return -ENOMEM;
2691+
}
2692+
26802693
if (genl_register_family(&nbd_genl_family)) {
2694+
put_cred(nbd_cred);
26812695
destroy_workqueue(nbd_del_wq);
26822696
unregister_blkdev(NBD_MAJOR, "nbd");
26832697
return -EINVAL;
@@ -2732,6 +2746,7 @@ static void __exit nbd_cleanup(void)
27322746
/* Also wait for nbd_dev_remove_work() completes */
27332747
destroy_workqueue(nbd_del_wq);
27342748

2749+
put_cred(nbd_cred);
27352750
idr_destroy(&nbd_index_idr);
27362751
unregister_blkdev(NBD_MAJOR, "nbd");
27372752
}

0 commit comments

Comments
 (0)