s390/ipl: Fix FCP WWPN and LUN format strings for read (eda4ddf7) · Commits · 戴 / test

The following git commit changed the behavior of sscanf: commit Author: Jan Beulich <JBeulich@suse.com> Date: Mon Dec 17 16:01:31 2012 -0800 sscanf: don't ignore field widths for numeric conversions This broke the WWPN and LUN sysfs attributes for s390 reipl and dump on panic. Example: $ echo 0x0123456701234567 > /sys/firmware/reipl/fcp/wwpn $ cat /sys/firmware/reipl/fcp/wwpn 0x0001234567012345 So fix this and use format strings that work also with the new sscanf implementation: $ echo 0x012345670123456789 > /sys/firmware/reipl/fcp/wwpn $ cat /sys/firmware/reipl/fcp/wwpn 0x0123456701234567 Cc: stable@vger.kernel.org # 3.8+ Reviewed-by:

Steffen Maier <maier@linux.vnet.ibm.com> Signed-off-by:

Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by:

Martin Schwidefsky <schwidefsky@de.ibm.com>

arch/s390/kernel/ipl.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -754,9 +754,9 @@ static struct bin_attribute sys_reipl_fcp_scp_data_attr = {
		.write = reipl_fcp_scpdata_write,
		};

		DEFINE_IPL_ATTR_RW(reipl_fcp, wwpn, "0x%016llx\n", "%016llx\n",
		DEFINE_IPL_ATTR_RW(reipl_fcp, wwpn, "0x%016llx\n", "%llx\n",
		reipl_block_fcp->ipl_info.fcp.wwpn);
		DEFINE_IPL_ATTR_RW(reipl_fcp, lun, "0x%016llx\n", "%016llx\n",
		DEFINE_IPL_ATTR_RW(reipl_fcp, lun, "0x%016llx\n", "%llx\n",
		reipl_block_fcp->ipl_info.fcp.lun);
		DEFINE_IPL_ATTR_RW(reipl_fcp, bootprog, "%lld\n", "%lld\n",
		reipl_block_fcp->ipl_info.fcp.bootprog);
		@@ -1323,9 +1323,9 @@ static struct shutdown_action __refdata reipl_action = {

		/* FCP dump device attributes */

		DEFINE_IPL_ATTR_RW(dump_fcp, wwpn, "0x%016llx\n", "%016llx\n",
		DEFINE_IPL_ATTR_RW(dump_fcp, wwpn, "0x%016llx\n", "%llx\n",
		dump_block_fcp->ipl_info.fcp.wwpn);
		DEFINE_IPL_ATTR_RW(dump_fcp, lun, "0x%016llx\n", "%016llx\n",
		DEFINE_IPL_ATTR_RW(dump_fcp, lun, "0x%016llx\n", "%llx\n",
		dump_block_fcp->ipl_info.fcp.lun);
		DEFINE_IPL_ATTR_RW(dump_fcp, bootprog, "%lld\n", "%lld\n",
		dump_block_fcp->ipl_info.fcp.bootprog);

Admin message