Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

nfs: use credential guards in nfs_local_call_read()

Use credential guards for scoped credential override with automatic
restoration on scope exit.

Link: https://patch.msgid.link/20251103-work-creds-guards-simple-v1-10-a3e156839e7f@kernel.org
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

+14 -17
+14 -17
fs/nfs/localio.c
··· 595 595 struct nfs_local_kiocb *iocb = 596 596 container_of(work, struct nfs_local_kiocb, work); 597 597 struct file *filp = iocb->kiocb.ki_filp; 598 - const struct cred *save_cred; 599 598 ssize_t status; 600 599 601 - save_cred = override_creds(filp->f_cred); 600 + scoped_with_creds(filp->f_cred) { 601 + for (int i = 0; i < iocb->n_iters ; i++) { 602 + if (iocb->iter_is_dio_aligned[i]) { 603 + iocb->kiocb.ki_flags |= IOCB_DIRECT; 604 + iocb->kiocb.ki_complete = nfs_local_read_aio_complete; 605 + iocb->aio_complete_work = nfs_local_read_aio_complete_work; 606 + } 602 607 603 - for (int i = 0; i < iocb->n_iters ; i++) { 604 - if (iocb->iter_is_dio_aligned[i]) { 605 - iocb->kiocb.ki_flags |= IOCB_DIRECT; 606 - iocb->kiocb.ki_complete = nfs_local_read_aio_complete; 607 - iocb->aio_complete_work = nfs_local_read_aio_complete_work; 608 - } 609 - 610 - iocb->kiocb.ki_pos = iocb->offset[i]; 611 - status = filp->f_op->read_iter(&iocb->kiocb, &iocb->iters[i]); 612 - if (status != -EIOCBQUEUED) { 613 - nfs_local_pgio_done(iocb->hdr, status); 614 - if (iocb->hdr->task.tk_status) 615 - break; 608 + iocb->kiocb.ki_pos = iocb->offset[i]; 609 + status = filp->f_op->read_iter(&iocb->kiocb, &iocb->iters[i]); 610 + if (status != -EIOCBQUEUED) { 611 + nfs_local_pgio_done(iocb->hdr, status); 612 + if (iocb->hdr->task.tk_status) 613 + break; 614 + } 616 615 } 617 616 } 618 - 619 - revert_creds(save_cred); 620 617 621 618 if (status != -EIOCBQUEUED) { 622 619 nfs_local_read_done(iocb, status);