Skip to contentSkip to conversation

block/compat_ioctl: fix range check in BLKGETSIZE

PATCH In review Khazhismel Kumykov 2 participants 6 messages Apr 19, 2022 – Apr 26, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block/compat_ioctl: fix range check in BLKGETSIZE

[ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ]

kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches.

This would result in truncation rather than EFBIG for 32bit mode for large disks.

---

The original commit should apply to the newer stables, this should apply to all the older stables.

 block/compat_ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/compat_ioctl.c +1 -1
index 7f053468b50d..d490ac220ba8 100644
@@ -393,7 +393,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 		return 0;
 	case BLKGETSIZE:
 		size = i_size_read(bdev->bd_inode);
-		if ((size >> 9) > ~0UL)
+		if ((size >> 9) > ~(compat_ulong_t)0)
 			return -EFBIG;
 		return compat_put_ulong(arg, size >> 9);
 
Signature · 1 line
2.36.0.rc0.470.gd361397f0d-goog
maintainer
#1 lore raw
Quoted 14 lines · Khazhismel Kumykov

[ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ]

kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches.

This would result in truncation rather than EFBIG for 32bit mode for large disks.

Quoted 3 lines

---

The original commit should apply to the newer stables

It does not, it only applied to 5.17.y.

Please provide working backports for all of the others.

Quoted 2 lines

this should apply
to all the older stables.

I'll wait for the 5.10.y and 5.15.y backport first before applying this one.

thanks,

greg k-h

#2 lore raw
Quoted 22 lines · Greg KH
Quoted 14 lines · Khazhismel Kumykov

[ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ]

kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches.

This would result in truncation rather than EFBIG for 32bit mode for large disks.

Quoted 3 lines

---

The original commit should apply to the newer stables

It does not, it only applied to 5.17.y.

Quoted 7 lines

Please provide working backports for all of the others.

Quoted 2 lines

this should apply
to all the older stables.

I'll wait for the 5.10.y and 5.15.y backport first before applying this one.

I double checked and the above patch applied to 4.9-5.4 for me

Quoted 4 lines

thanks,

greg k-h

maintainer
#3 lore raw
Quoted 23 lines · Khazhy Kumykov
Quoted 22 lines · Greg KH
Quoted 14 lines · Khazhismel Kumykov

[ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ]

kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches.

This would result in truncation rather than EFBIG for 32bit mode for large disks.

Quoted 3 lines

---

The original commit should apply to the newer stables

It does not, it only applied to 5.17.y.

Quoted 8 lines
Quoted 7 lines

Please provide working backports for all of the others.

Quoted 2 lines

this should apply
to all the older stables.

I'll wait for the 5.10.y and 5.15.y backport first before applying this one.

I double checked and the above patch applied to 4.9-5.4 for me

All now queued up, thanks.

greg k-h

#4 lore raw

PATCH 1/1 block/compat_ioctl: fix range check in BLKGETSIZE

In reply to Khazhismel Kumykov

[ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ]

kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches.

This would result in truncation rather than EFBIG for 32bit mode for large disks.

---
 block/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/ioctl.c +1 -1
index ed240e170e14..e7eed7dadb5c 100644
@@ -679,7 +679,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 			       (bdev->bd_bdi->ra_pages * PAGE_SIZE) / 512);
 	case BLKGETSIZE:
 		size = i_size_read(bdev->bd_inode);
-		if ((size >> 9) > ~0UL)
+		if ((size >> 9) > ~(compat_ulong_t)0)
 			return -EFBIG;
 		return compat_put_ulong(argp, size >> 9);
 
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
#5 lore raw

PATCH 1/1 block/compat_ioctl: fix range check in BLKGETSIZE

[ Upstream commit ccf16413e520164eb718cf8b22a30438da80ff23 ]

kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches.

This would result in truncation rather than EFBIG for 32bit mode for large disks.

---
 block/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/ioctl.c +1 -1
index a31be7fa31a5..cd506a902963 100644
@@ -645,7 +645,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 			(bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512);
 	case BLKGETSIZE:
 		size = i_size_read(bdev->bd_inode);
-		if ((size >> 9) > ~0UL)
+		if ((size >> 9) > ~(compat_ulong_t)0)
 			return -EFBIG;
 		return compat_put_ulong(argp, size >> 9);
 
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog