/[linux-patches]/genpatches-2.6/tags/2.6.15-11/1105_s390-strnlen-user.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.15-11/1105_s390-strnlen-user.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 351 - (show annotations) (download)
Wed Mar 29 11:55:38 2006 UTC (12 years, 2 months ago) by dsd
File size: 884 byte(s)
2.6.15-11 release
1 --- linux-2.6.9/arch/s390/lib/uaccess.S.orig 2006-02-16 20:10:02.000000000 +0000
2 +++ linux-2.6.9/arch/s390/lib/uaccess.S 2006-02-16 20:10:41.000000000 +0000
3 @@ -198,9 +198,9 @@ __strnlen_user_asm:
4 0: srst %r2,%r1
5 jo 0b
6 sacf 0
7 - jh 1f # \0 found in string ?
8 ahi %r2,1 # strnlen_user result includes the \0
9 -1: slr %r2,%r3
10 + # also advance the result to >maxlen if not found
11 + slr %r2,%r3
12 br %r14
13 2: sacf 0
14 lhi %r2,-EFAULT
15 --- linux-2.6.9/arch/s390/lib/uaccess64.S.orig 2006-02-16 20:11:51.000000000 +0000
16 +++ linux-2.6.9/arch/s390/lib/uaccess64.S 2006-02-16 20:12:03.000000000 +0000
17 @@ -194,9 +194,9 @@ __strnlen_user_asm:
18 0: srst %r2,%r1
19 jo 0b
20 sacf 0
21 - jh 1f # \0 found in string ?
22 aghi %r2,1 # strnlen_user result includes the \0
23 -1: slgr %r2,%r3
24 + # also advance the result to >maxlen if not found
25 + slgr %r2,%r3
26 br %r14
27 2: sacf 0
28 lghi %r2,-EFAULT

  ViewVC Help
Powered by ViewVC 1.1.20