diff options
| author | Laura Abbott <labbott@redhat.com> | 2017-01-10 13:35:45 -0800 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-01-11 13:56:50 +0000 |
| commit | 46f6236aa1c48e06b10a2fe0386ac4114b438622 (patch) | |
| tree | c935d6d0772a5b4e78bc9e7cf2ff4f6011b67fa2 /mm/usercopy.c | |
| parent | 5c6a84a3f4558a6115fef1b59343c7ae56b3abc3 (diff) | |
| download | lwn-46f6236aa1c48e06b10a2fe0386ac4114b438622.tar.gz lwn-46f6236aa1c48e06b10a2fe0386ac4114b438622.zip | |
mm/usercopy: Switch to using lm_alias
The usercopy checking code currently calls __va(__pa(...)) to check for
aliases on symbols. Switch to using lm_alias instead.
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'mm/usercopy.c')
| -rw-r--r-- | mm/usercopy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/usercopy.c b/mm/usercopy.c index 3c8da0af9695..8345299e3e3b 100644 --- a/mm/usercopy.c +++ b/mm/usercopy.c @@ -108,13 +108,13 @@ static inline const char *check_kernel_text_object(const void *ptr, * __pa() is not just the reverse of __va(). This can be detected * and checked: */ - textlow_linear = (unsigned long)__va(__pa(textlow)); + textlow_linear = (unsigned long)lm_alias(textlow); /* No different mapping: we're done. */ if (textlow_linear == textlow) return NULL; /* Check the secondary mapping... */ - texthigh_linear = (unsigned long)__va(__pa(texthigh)); + texthigh_linear = (unsigned long)lm_alias(texthigh); if (overlaps(ptr, n, textlow_linear, texthigh_linear)) return "<linear kernel text>"; |