Message ID | 20190301201010.19094-1-jannh@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | integrity: use KERNEL_DS instead of get_ds() | expand |
On Fri, Mar 1, 2019 at 9:10 PM Jann Horn <jannh@google.com> wrote: > > get_ds() is a legacy name for KERNEL_DS; all architectures #define it to > KERNEL_DS, and almost every user of set_fs() uses the name KERNEL_DS. > > Let the integrity subsystem also use KERNEL_DS so that we can get rid of > get_ds() at some point. Nevermind, Linus just did this across the tree in https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=736706bee3298208343a76096370e4f6a5c55915 .
diff --git a/security/integrity/iint.c b/security/integrity/iint.c index 88f04b3380d4..423876fca8b4 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -200,7 +200,7 @@ int integrity_kernel_read(struct file *file, loff_t offset, return -EBADF; old_fs = get_fs(); - set_fs(get_ds()); + set_fs(KERNEL_DS); ret = __vfs_read(file, buf, count, &offset); set_fs(old_fs);
get_ds() is a legacy name for KERNEL_DS; all architectures #define it to KERNEL_DS, and almost every user of set_fs() uses the name KERNEL_DS. Let the integrity subsystem also use KERNEL_DS so that we can get rid of get_ds() at some point. Signed-off-by: Jann Horn <jannh@google.com> --- security/integrity/iint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)