diff options
| author | Chen, Kenneth W <kenneth.w.chen@intel.com> | 2006-11-08 16:29:25 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-12-07 11:19:59 -0800 |
| commit | 6dbfc19b7ea93f94f1efabaae71a921b49d8cae2 (patch) | |
| tree | ecf26fe7da3e261e81a878942604aca3c9fe7e2d | |
| parent | 007d77d0c5eb36555443ff273ce2a27f90da8837 (diff) | |
| download | kernel_samsung_aries-6dbfc19b7ea93f94f1efabaae71a921b49d8cae2.zip kernel_samsung_aries-6dbfc19b7ea93f94f1efabaae71a921b49d8cae2.tar.gz kernel_samsung_aries-6dbfc19b7ea93f94f1efabaae71a921b49d8cae2.tar.bz2 | |
[IA64] tidy up return value of ip_fast_csum
While working on implementing csum_ipv6_magic, I noticed that current
version of ip_fast_csum will potentially return bits above "unsigned
short" as 1. While no harm is done right now because all call sites
will chop off the upper bits when it uses the return value. However,
this is still dangerous and buggy. Here is a patch to enforce that the
function really returns unsigned short in the native register format.
The fix is free as there are plenty open slot to add one more asm instruction.
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/lib/ip_fast_csum.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/lib/ip_fast_csum.S b/arch/ia64/lib/ip_fast_csum.S index 4fb132e..1f86aeb 100644 --- a/arch/ia64/lib/ip_fast_csum.S +++ b/arch/ia64/lib/ip_fast_csum.S @@ -68,8 +68,9 @@ GLOBAL_ENTRY(ip_fast_csum) zxt2 r20=r20 ;; add r20=ret0,r20 + mov r9=0xffff ;; - andcm ret0=-1,r20 + andcm ret0=r9,r20 .restore sp // reset frame state br.ret.sptk.many b0 ;; |