vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/disk/raid6_recover.c: Use unsigned arithmetics when

Browse source 
appropriate.
This commit is contained in:
Vladimir Serbinenko 2013-10-25 22:51:03 +02:00
parent 3523b8d8a7
commit 428295739e
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/raid6_recover.c: Use unsigned arithmetics when
appropriate.
2013-10-25 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/bitmap_scale.c: Use unsigned arithmetics when * grub-core/video/bitmap_scale.c: Use unsigned arithmetics when

13
grub-core/disk/raid6_recover.c
View file

@ -30,11 +30,11 @@ GRUB_MOD_LICENSE ("GPLv3+");
/* x**y. */ /* x**y. */
static grub_uint8_t powx[255 * 2]; static grub_uint8_t powx[255 * 2];
/* Such an s that x**s = y */ /* Such an s that x**s = y */
static int powx_inv[256]; static unsigned powx_inv[256];
static const grub_uint8_t poly = 0x1d; static const grub_uint8_t poly = 0x1d;
static void static void
grub_raid_block_mulx (int mul, char *buf, int size) grub_raid_block_mulx (unsigned mul, char *buf, int size)
{ {
int i; int i;
grub_uint8_t *p; grub_uint8_t *p;
@ -48,7 +48,7 @@ grub_raid_block_mulx (int mul, char *buf, int size)
static void static void
grub_raid6_init_table (void) grub_raid6_init_table (void)
{ {
int i; unsigned i;
grub_uint8_t cur = 1; grub_uint8_t cur = 1;
for (i = 0; i < 255; i++) for (i = 0; i < 255; i++)
@ -148,7 +148,7 @@ grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int p,
else else
{ {
/* Two bad devices */ /* Two bad devices */
int c; unsigned c;
if (grub_diskfilter_read_node (&array->nodes[p], sector, if (grub_diskfilter_read_node (&array->nodes[p], sector,
size >> GRUB_DISK_SECTOR_BITS, buf)) size >> GRUB_DISK_SECTOR_BITS, buf))
@ -162,10 +162,11 @@ grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int p,
grub_crypto_xor (qbuf, qbuf, buf, size); grub_crypto_xor (qbuf, qbuf, buf, size);
c = (255 - bad1 + (255 - powx_inv[(powx[bad2 - bad1 + 255] ^ 1)])) % 255; c = ((255 ^ bad1)
+ (255 ^ powx_inv[(powx[bad2 + (bad1 ^ 255)] ^ 1)])) % 255;
grub_raid_block_mulx (c, qbuf, size); grub_raid_block_mulx (c, qbuf, size);
c = (bad2 + c) % 255; c = ((unsigned) bad2 + c) % 255;
grub_raid_block_mulx (c, pbuf, size); grub_raid_block_mulx (c, pbuf, size);
grub_crypto_xor (pbuf, pbuf, qbuf, size); grub_crypto_xor (pbuf, pbuf, qbuf, size);