From 47beefeb734480aebea4b748151d7f2d6db480e3 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 24 Sep 2020 15:38:35 -0400 Subject: [PATCH] fix: Use 'kernel_read' to read from procfs Use the 'kernel_read' helper to read files in procfs, it's present in the kernel since the 2.6 series and does the right thing on kernels that require the set_fs dance and newer one which don't. Change-Id: I1a53fda379e0bb9acc79331626925bbdba63d727 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- wrapper/random.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/wrapper/random.c b/wrapper/random.c index eb41769c..d7e53cd1 100644 --- a/wrapper/random.c +++ b/wrapper/random.c @@ -28,21 +28,12 @@ int wrapper_get_bootid(char *bootid) struct file *file; int ret; ssize_t len; - mm_segment_t old_fs; file = filp_open("/proc/sys/kernel/random/boot_id", O_RDONLY, 0); if (IS_ERR(file)) return PTR_ERR(file); - old_fs = get_fs(); - set_fs(KERNEL_DS); - - if (!file->f_op || !file->f_op->read) { - ret = -EINVAL; - goto end; - } - - len = file->f_op->read(file, bootid, BOOT_ID_LEN - 1, &file->f_pos); + len = kernel_read(file, bootid, BOOT_ID_LEN - 1, &file->f_pos); if (len != BOOT_ID_LEN - 1) { ret = -EINVAL; goto end; @@ -51,7 +42,6 @@ int wrapper_get_bootid(char *bootid) bootid[BOOT_ID_LEN - 1] = '\0'; ret = 0; end: - set_fs(old_fs); filp_close(file, current->files); return ret; } -- 2.34.1