Commit 8aa0f49c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-6.14-rc1-tag' of... 

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
parents a67d0a05 07e0d99a

drivers/firmware/iscsi_ibft.c

+4 −1
Original line number Diff line number Diff line
@@ -310,6 +310,9 @@ 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:

		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;

drivers/firmware/Kconfig

+1 −1

File changed.

Contains only whitespace changes.