From: rabin@rab.in (Rabin Vincent)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: fix string functions on !MMU
Date: Mon, 21 Apr 2014 20:10:08 +0200 [thread overview]
Message-ID: <1398103808-24380-1-git-send-email-rabin@rab.in> (raw)
8c56cc8be5b38e ("ARM: 7449/1: use generic strnlen_user and
strncpy_from_user functions") apparently broken those string operations
for !MMU. USER_DS == KERNEL_DS on !MMU, so user_addr_max() always
restricts the addresses to TASK_SIZE.
TASK_SIZE has anyway no meaning on !MMU, so make user_addr_max() not
restrict anything.
Signed-off-by: Rabin Vincent <rabin@rab.in>
---
arch/arm/include/asm/uaccess.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index 12c3a5d..c3a65f1 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -199,6 +199,9 @@ extern int __put_user_8(void *, unsigned long long);
__put_user_check(x,p); \
})
+#define user_addr_max() \
+ (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
+
#else /* CONFIG_MMU */
/*
@@ -210,6 +213,7 @@ extern int __put_user_8(void *, unsigned long long);
#define __addr_ok(addr) ((void)(addr),1)
#define __range_ok(addr,size) ((void)(addr),0)
#define get_fs() (KERNEL_DS)
+#define user_addr_max() (~0UL)
static inline void set_fs(mm_segment_t fs)
{
@@ -222,9 +226,6 @@ static inline void set_fs(mm_segment_t fs)
#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
-#define user_addr_max() \
- (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
-
/*
* The "__xxx" versions of the user access functions do not verify the
* address space - it must have been done previously with a separate
--
1.9.1
next reply other threads:[~2014-04-21 18:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 18:10 Rabin Vincent [this message]
2014-04-22 9:44 ` [PATCH] ARM: fix string functions on !MMU Will Deacon
2014-04-24 15:43 ` Rabin Vincent
2014-04-25 9:12 ` Will Deacon
2014-04-25 18:45 ` Rabin Vincent
2014-04-28 19:10 ` Will Deacon
2014-04-28 7:51 ` Uwe Kleine-König
2014-06-02 16:53 ` Rabin Vincent
2014-06-03 7:51 ` Uwe Kleine-König
2014-06-03 19:47 ` Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398103808-24380-1-git-send-email-rabin@rab.in \
--to=rabin@rab.in \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).