niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

* Kconfig and IPv6 minor fixes.

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEQ66yPI/CGXuxfLixUqUOhPHbCb8FAmemEjEACgkQUqUOhPHb
 Cb8/YQ/+OW+nutUEOhUo8JjMpQduizV2cb3RzFlCzWHeEHede/Q/NUqv/cLJPvbv
 /2D9Mxsruh/gzStbfmbBnL14XCAVf9k29CIfuiIy7Yk1W8mgD0J4Hb5hY5UcSuhU
 Ehizc4E+G6R2ZyJcfnm1Aa8jlry6FEjFJBDZOwLf4+1t95iU0E4YeO4DkORpLU2k
 m3pcwwyN8BU/1Z+MMtsHVSuNB15MMSybfxUbLIMbVf95futOtuIkp6eQSwAah9vt
 5aRsUTqseBM8TYvpIlne3GzgbopW53kbHVRbkwRSp2jioCbxYCeIMuuOiL6oR359
 GvDXtaeVkS/FZ4yyj/7B/Gin4v0Qk0iEbWKMUfUjjzx7KcxSVVchaJIqBnGc4ZNz
 BYHnoMqPtvrtIVe/GrHGDkr4YVDZJu9CRF2QMiUYYGsVUDgHZ+EFe/9VcICRRmW0
 9iYlMMkS5GfsdypsFI5wYlA9wpcDBqv0YD55ArjoMjy9p5mb4cwLeomwClIZjPcX
 hj7bLrVx98EjmwU4ALx0wmQZfbAcRPKplmE8uiPNSzEqRfndqhdxVgh2NiurHE/w
 2xSYANeaNHdLocV/8Xgg2uxr30uleGRxLHHa2HJ6zzr5Vau2XqkRiMY+jpKWojLM
 xd+Kevqk7vWpkrVwIaVYVVCNlhcG+FctQRwh+Jr0b5NhBK19qRQ=
 =sBZ7
 -----END PGP SIGNATURE-----

Merge tag 'stable/for-linus-6.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft

Pull ibft fixes from Konrad Rzeszutek Wilk:
 "Two tiny fixes to IBFT code: one for Kconfig and another for IPv6"

* tag 'stable/for-linus-6.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: Fix UBSAN shift-out-of-bounds warning in ibft_attr_show_nic()
  firmware: iscsi_ibft: fix ISCSI_IBFT Kconfig entry
This commit is contained in:
Linus Torvalds 2025-02-07 11:05:50 -08:00
commit 8aa0f49c00
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/firmware/Kconfig
View file

@ -106,7 +106,7 @@ config ISCSI_IBFT
select ISCSI_BOOT_SYSFS
select ISCSI_IBFT_FIND if X86
depends on ACPI && SCSI && SCSI_LOWLEVEL
default n
default n
help
This option enables support for detection and exposing of iSCSI
Boot Firmware Table (iBFT) via sysfs to userspace. If you wish to

5
drivers/firmware/iscsi_ibft.c
View file

@ -310,7 +310,10 @@ static ssize_t ibft_attr_show_nic(void *data, int type, char *buf)
str += sprintf_ipaddr(str, nic->ip_addr);
break;
case ISCSI_BOOT_ETH_SUBNET_MASK:
val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
if (nic->subnet_mask_prefix > 32)
val = cpu_to_be32(~0);
else
val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
str += sprintf(str, "%pI4", &val);
break;
case ISCSI_BOOT_ETH_PREFIX_LEN: