s390/dasd patches
Subsystems (3)
Stefan Haberland
maintainercover s390/dasd patches
Hi Jens,
please apply the following two patches that unexport a DASD symbol and improve a DASD structure.
Christoph Hellwig (1):
dasd: unexport dasd_set_target_state
Kees Cook (1):
s390/dasd: Avoid field over-reading memcpy()
drivers/s390/block/dasd.c | 1 - drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/block/dasd_eckd.h | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
Stefan Haberland
maintainerPATCH 1/2 dasd: unexport dasd_set_target_state
From: Christoph Hellwig <[email protected]>
dasd_set_target_state is only used inside of dasd_mod.ko, so don't export it.
--- drivers/s390/block/dasd.c | 1 - 1 file changed, 1 deletion(-)
drivers/s390/block/dasd.c +0 -1
@@ -621,7 +621,6 @@ void dasd_set_target_state(struct dasd_device *device, int target)mutex_unlock (&device->state_mutex);dasd_put_device (device); } -EXPORT_SYMBOL (dasd_set_target_state);/* * Enable devices with device numbers in [from..to].
Signature · 1 line
2.25.1
Stefan Haberland
maintainerPATCH 2/2 s390/dasd: Avoid field over-reading memcpy()
In reply to Stefan HaberlandFrom: Kees Cook <[email protected]>
In preparation for FORTIFY_SOURCE performing compile-time and run-time field array bounds checking for memcpy(), memmove(), and memset(), avoid intentionally reading across neighboring array fields.
Add a wrapping structure to serve as the memcpy() source, so the compiler can do appropriate bounds checking, avoiding this future warning:
In function '__fortify_memcpy',
inlined from 'create_uid' at drivers/s390/block/dasd_eckd.c:749:2:
./include/linux/fortify-string.h:246:4: error: call to '__read_overflow2_field' declared with attribute error: detected read beyond size of field (2nd parameter)
--- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/block/dasd_eckd.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/s390/block/dasd_eckd.c +1 -1
@@ -746,7 +746,7 @@ static void create_uid(struct dasd_eckd_private *private)memcpy (uid->vendor, private->ned->HDA_manufacturer,sizeof (uid->vendor) -1 );EBCASC (uid->vendor,sizeof (uid->vendor) -1 ); -memcpy (uid->serial, private->ned->HDA_location, +memcpy (uid->serial, &private->ned->serial,sizeof (uid->serial) -1 );EBCASC (uid->serial,sizeof (uid->serial) -1 ); uid->ssid = private->gneq->subsystemID;
drivers/s390/block/dasd_eckd.h +4 -2
@@ -332,8 +332,10 @@ struct dasd_ned {__u8 dev_type[6 ];__u8 dev_model[3 ];__u8 HDA_manufacturer[3 ]; -__u8 HDA_location[2 ]; -__u8 HDA_seqno[12 ]; +struct { +__u8 HDA_location[2 ]; +__u8 HDA_seqno[12 ]; + } serial;__u8 ID ;__u8 unit_addr; } __attribute__ ((packed));
Signature · 1 line
2.25.1
Quoted 8 lines · Stefan Haberland
Hi Jens,
please apply the following two patches that unexport a DASD symbol and improve a DASD structure.
Christoph Hellwig (1):
dasd: unexportdasd_set_target_state
Quoted 7 lines
Kees Cook (1):
s390/dasd: Avoid field over-readingmemcpy()drivers/s390/block/dasd.c | 1 - drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/block/dasd_eckd.h | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-)
Applied, thanks.
Signature · 1 line
Jens Axboe