hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] char/moxa.c: fix endianess and multiple-card issues 

While testing Moxa C218T/PCI on PowerPC 405EP I found that loading firmware
using the linux kernel driver fails because calculation of the checksum is
not endianess independent in the original code.

After I fixed this I found that uploading firmware in a system with
multiple cards causes a kernel oops.  I had a look in the recent moxa
sources and found that they do some kind of locking there.  Applying this
lock fixed the problem.

Alan sayeth:

  Checksum changes are clearly correct.  Other changes is an improvement but
  not I think enough to handle malicious firmware attacks.  That said such an
  attacker has CAP_SYS_RAWIO anyway so that part is irrelevant except for
  neatness.

[akpm@osdl.org: cleanups]
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dirk Eibach 2006-08-27 01:23:36 -07:00 committed by Linus Torvalds
parent a0cc621f52
commit 01cfaf0d12
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/char/moxa.c
View File

@ -142,6 +142,7 @@ typedef struct _moxa_board_conf {
static moxa_board_conf moxa_boards[MAX_BOARDS]; static moxa_board_conf moxa_boards[MAX_BOARDS];
static void __iomem *moxaBaseAddr[MAX_BOARDS]; static void __iomem *moxaBaseAddr[MAX_BOARDS];
static int loadstat[MAX_BOARDS];
struct moxa_str { struct moxa_str {
int type; int type;
@ -1688,6 +1689,8 @@ int MoxaDriverPoll(void)
if (moxaCard == 0) if (moxaCard == 0)
return (-1); return (-1);
for (card = 0; card < MAX_BOARDS; card++) { for (card = 0; card < MAX_BOARDS; card++) {
if (loadstat[card] == 0)
continue;
if ((ports = moxa_boards[card].numPorts) == 0) if ((ports = moxa_boards[card].numPorts) == 0)
continue; continue;
if (readb(moxaIntPend[card]) == 0xff) { if (readb(moxaIntPend[card]) == 0xff) {
@ -2903,6 +2906,7 @@ static int moxaloadcode(int cardno, unsigned char __user *tmp, int len)
} }
break; break;
} }
loadstat[cardno] = 1;
return (0); return (0);
} }
@ -2920,7 +2924,7 @@ static int moxaloadc218(int cardno, void __iomem *baseAddr, int len)
len1 = len >> 1; len1 = len >> 1;
ptr = (ushort *) moxaBuff; ptr = (ushort *) moxaBuff;
for (i = 0; i < len1; i++) for (i = 0; i < len1; i++)
usum += *(ptr + i); usum += le16_to_cpu(*(ptr + i));
retry = 0; retry = 0;
do { do {
len1 = len >> 1; len1 = len >> 1;
@ -2992,7 +2996,7 @@ static int moxaloadc320(int cardno, void __iomem *baseAddr, int len, int *numPor
wlen = len >> 1; wlen = len >> 1;
uptr = (ushort *) moxaBuff; uptr = (ushort *) moxaBuff;
for (i = 0; i < wlen; i++) for (i = 0; i < wlen; i++)
usum += uptr[i]; usum += le16_to_cpu(uptr[i]);
retry = 0; retry = 0;
j = 0; j = 0;
do { do {