Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 32a9ff9cc55b42543a84bca90b070df92af72671

Authored by Arnd Bergmann
1 parent fcec9bf124
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

lib/checksum.c: fix endianess bug 

The new generic checksum code has a small dependency on endianess and
worked only on big-endian systems. I could not find a nice efficient
way to express this, so I added an #ifdef. Using
'result += le16_to_cpu(*buff);' would have worked as well, but
would be slightly less efficient on big-endian systems and IMHO
would not be clearer.

Also fix a bug that prevents this from working on 64-bit machines.
If you have a 64-bit CPU and want to use the generic checksum
code, you should probably do some more optimizations anyway, but
at least the code should not break.

Reported-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Showing 1 changed file with 9 additions and 1 deletions Side-by-side Diff

... ... @@ -55,7 +55,11 @@
55 55 goto out;
56 56 odd = 1 & (unsigned long) buff;
57 57 if (odd) {
  58 +#ifdef __LITTLE_ENDIAN
58 59 result = *buff;
  60 +#else
  61 + result += (*buff << 8);
  62 +#endif
59 63 len--;
60 64 buff++;
61 65 }
... ... @@ -71,7 +75,7 @@
71 75 if (count) {
72 76 unsigned long carry = 0;
73 77 do {
74   - unsigned long w = *(unsigned long *) buff;
  78 + unsigned long w = *(unsigned int *) buff;
75 79 count--;
76 80 buff += 4;
77 81 result += carry;
78 82  
... ... @@ -87,7 +91,11 @@
87 91 }
88 92 }
89 93 if (len & 1)
  94 +#ifdef __LITTLE_ENDIAN
  95 + result += *buff;
  96 +#else
90 97 result += (*buff << 8);
  98 +#endif
91 99 result = from32to16(result);
92 100 if (odd)
93 101 result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);