1From a201ad17caa430aa710654fdf2e6ab4c8166f031 Mon Sep 17 00:00:00 2001
2From: Darren Kenny <darren.kenny@oracle.com>
3Date: Thu, 21 Jan 2021 11:38:31 +0000
4Subject: [PATCH] disk/cryptodisk: Fix potential integer overflow
5
6The encrypt and decrypt functions expect a grub_size_t. So, we need to
7ensure that the constant bit shift is using grub_size_t rather than
8unsigned int when it is performing the shift.
9
10Fixes: CID 307788
11
12Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
13Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
14Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
15---
16 grub-core/disk/cryptodisk.c | 8 ++++----
17 1 file changed, 4 insertions(+), 4 deletions(-)
18
19diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
20index 5037768..6883f48 100644
21--- a/grub-core/disk/cryptodisk.c
22+++ b/grub-core/disk/cryptodisk.c
23@@ -311,10 +311,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
24 	case GRUB_CRYPTODISK_MODE_CBC:
25 	  if (do_encrypt)
26 	    err = grub_crypto_cbc_encrypt (dev->cipher, data + i, data + i,
27-					   (1U << dev->log_sector_size), iv);
28+					   ((grub_size_t) 1 << dev->log_sector_size), iv);
29 	  else
30 	    err = grub_crypto_cbc_decrypt (dev->cipher, data + i, data + i,
31-					   (1U << dev->log_sector_size), iv);
32+					   ((grub_size_t) 1 << dev->log_sector_size), iv);
33 	  if (err)
34 	    return err;
35 	  break;
36@@ -322,10 +322,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
37 	case GRUB_CRYPTODISK_MODE_PCBC:
38 	  if (do_encrypt)
39 	    err = grub_crypto_pcbc_encrypt (dev->cipher, data + i, data + i,
40-					    (1U << dev->log_sector_size), iv);
41+					    ((grub_size_t) 1 << dev->log_sector_size), iv);
42 	  else
43 	    err = grub_crypto_pcbc_decrypt (dev->cipher, data + i, data + i,
44-					    (1U << dev->log_sector_size), iv);
45+					    ((grub_size_t) 1 << dev->log_sector_size), iv);
46 	  if (err)
47 	    return err;
48 	  break;
49--
502.14.2
51
52