From: Greg Kroah-Hartman Date: Wed, 24 Jul 2019 05:43:02 +0000 (+0200) Subject: add s-o-b to floppy patches X-Git-Tag: v5.2.3~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d9d00dbf99d75b083864f6ff2bef948f8755947;p=thirdparty%2Fkernel%2Fstable-queue.git add s-o-b to floppy patches --- diff --git a/queue-4.4/floppy-fix-div-by-zero-in-setup_format_params.patch b/queue-4.4/floppy-fix-div-by-zero-in-setup_format_params.patch index ead84fa29a1..76ea9806e43 100644 --- a/queue-4.4/floppy-fix-div-by-zero-in-setup_format_params.patch +++ b/queue-4.4/floppy-fix-div-by-zero-in-setup_format_params.patch @@ -29,15 +29,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 5 +++++ + drivers/block/floppy.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index 5fe9e899d2a6..3fca5246bbaf 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -2114,6 +2114,9 @@ static void setup_format_params(int track) +@@ -2114,6 +2114,9 @@ static void setup_format_params(int trac raw_cmd->kernel_data = floppy_track_buffer; raw_cmd->length = 4 * F_SECT_PER_TRACK; @@ -47,7 +46,7 @@ index 5fe9e899d2a6..3fca5246bbaf 100644 /* allow for about 30ms for data transport per track */ head_shift = (F_SECT_PER_TRACK + 5) / 6; -@@ -3236,6 +3239,8 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g, +@@ -3236,6 +3239,8 @@ static int set_geometry(unsigned int cmd /* sanity checking for parameters. */ if (g->sect <= 0 || g->head <= 0 || @@ -56,6 +55,3 @@ index 5fe9e899d2a6..3fca5246bbaf 100644 g->track <= 0 || g->track > UDP->tracks >> STRETCH(g) || /* check if reserved bits are set */ (g->stretch & ~(FD_STRETCH | FD_SWAPSIDES | FD_SECTBASEMASK)) != 0) --- -2.20.1 - diff --git a/queue-4.4/floppy-fix-invalid-pointer-dereference-in-drive_name.patch b/queue-4.4/floppy-fix-invalid-pointer-dereference-in-drive_name.patch index 0e24af40baf..ce6cd298508 100644 --- a/queue-4.4/floppy-fix-invalid-pointer-dereference-in-drive_name.patch +++ b/queue-4.4/floppy-fix-invalid-pointer-dereference-in-drive_name.patch @@ -29,15 +29,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 11 ++++++++--- + drivers/block/floppy.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index e319fb6c96a7..013c25bad540 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -3384,7 +3384,8 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo) +@@ -3384,7 +3384,8 @@ static int fd_getgeo(struct block_device return 0; } @@ -47,7 +46,7 @@ index e319fb6c96a7..013c25bad540 100644 { size_t floppy_type_size = ARRAY_SIZE(floppy_type); size_t i = 0; -@@ -3395,6 +3396,9 @@ static bool valid_floppy_drive_params(const short autodetect[8]) +@@ -3395,6 +3396,9 @@ static bool valid_floppy_drive_params(co return false; } @@ -57,7 +56,7 @@ index e319fb6c96a7..013c25bad540 100644 return true; } -@@ -3524,7 +3528,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int +@@ -3524,7 +3528,8 @@ static int fd_locked_ioctl(struct block_ SUPBOUND(size, strlen((const char *)outparam) + 1); break; case FDSETDRVPRM: @@ -76,6 +75,3 @@ index e319fb6c96a7..013c25bad540 100644 return -EINVAL; mutex_lock(&floppy_mutex); UDP->cmos = v.cmos; --- -2.20.1 - diff --git a/queue-4.4/floppy-fix-out-of-bounds-read-in-copy_buffer.patch b/queue-4.4/floppy-fix-out-of-bounds-read-in-copy_buffer.patch index 45a81f32716..a08fa72bdda 100644 --- a/queue-4.4/floppy-fix-out-of-bounds-read-in-copy_buffer.patch +++ b/queue-4.4/floppy-fix-out-of-bounds-read-in-copy_buffer.patch @@ -26,15 +26,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 6 ++++-- + drivers/block/floppy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index 013c25bad540..35b2d2c86a1f 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -3237,8 +3237,10 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g, +@@ -3237,8 +3237,10 @@ static int set_geometry(unsigned int cmd int cnt; /* sanity checking for parameters. */ @@ -47,6 +46,3 @@ index 013c25bad540..35b2d2c86a1f 100644 /* check for zero in F_SECT_PER_TRACK */ (unsigned char)((g->sect << 2) >> FD_SIZECODE(g)) == 0 || g->track <= 0 || g->track > UDP->tracks >> STRETCH(g) || --- -2.20.1 - diff --git a/queue-4.4/floppy-fix-out-of-bounds-read-in-next_valid_format.patch b/queue-4.4/floppy-fix-out-of-bounds-read-in-next_valid_format.patch index a85de5de3d4..7952c912626 100644 --- a/queue-4.4/floppy-fix-out-of-bounds-read-in-next_valid_format.patch +++ b/queue-4.4/floppy-fix-out-of-bounds-read-in-next_valid_format.patch @@ -27,15 +27,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 18 ++++++++++++++++++ + drivers/block/floppy.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index 3fca5246bbaf..e319fb6c96a7 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -3384,6 +3384,20 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo) +@@ -3384,6 +3384,20 @@ static int fd_getgeo(struct block_device return 0; } @@ -56,7 +55,7 @@ index 3fca5246bbaf..e319fb6c96a7 100644 static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long param) { -@@ -3510,6 +3524,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int +@@ -3510,6 +3524,8 @@ static int fd_locked_ioctl(struct block_ SUPBOUND(size, strlen((const char *)outparam) + 1); break; case FDSETDRVPRM: @@ -74,6 +73,3 @@ index 3fca5246bbaf..e319fb6c96a7 100644 mutex_lock(&floppy_mutex); UDP->cmos = v.cmos; UDP->max_dtr = v.max_dtr; --- -2.20.1 - diff --git a/queue-4.4/take-floppy-compat-ioctls-to-sodding-floppy.c.patch b/queue-4.4/take-floppy-compat-ioctls-to-sodding-floppy.c.patch index 39cce75b6bc..38f9345b5fb 100644 --- a/queue-4.4/take-floppy-compat-ioctls-to-sodding-floppy.c.patch +++ b/queue-4.4/take-floppy-compat-ioctls-to-sodding-floppy.c.patch @@ -10,13 +10,12 @@ biarch. Signed-off-by: Al Viro Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - block/compat_ioctl.c | 340 ----------------------------------------- - drivers/block/floppy.c | 328 +++++++++++++++++++++++++++++++++++++++ + block/compat_ioctl.c | 340 ------------------------------------------------- + drivers/block/floppy.c | 328 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 328 insertions(+), 340 deletions(-) -diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c -index f678c733df40..d2c46454ffa8 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -4,7 +4,6 @@ @@ -27,7 +26,7 @@ index f678c733df40..d2c46454ffa8 100644 #include #include #include -@@ -209,318 +208,6 @@ static int compat_blkpg_ioctl(struct block_device *bdev, fmode_t mode, +@@ -209,318 +208,6 @@ static int compat_blkpg_ioctl(struct blo #define BLKBSZSET_32 _IOW(0x12, 113, int) #define BLKGETSIZE64_32 _IOR(0x12, 114, int) @@ -346,7 +345,7 @@ index f678c733df40..d2c46454ffa8 100644 static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, unsigned long arg) { -@@ -537,16 +224,6 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, +@@ -537,16 +224,6 @@ static int compat_blkdev_driver_ioctl(st case HDIO_GET_ADDRESS: case HDIO_GET_BUSSTATE: return compat_hdio_ioctl(bdev, mode, cmd, arg); @@ -363,7 +362,7 @@ index f678c733df40..d2c46454ffa8 100644 case CDROMREADAUDIO: return compat_cdrom_read_audio(bdev, mode, cmd, arg); case CDROM_SEND_PACKET: -@@ -566,23 +243,6 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, +@@ -566,23 +243,6 @@ static int compat_blkdev_driver_ioctl(st case HDIO_DRIVE_CMD: /* 0x330 is reserved -- it used to be HDIO_GETGEO_BIG */ case 0x330: @@ -387,8 +386,6 @@ index f678c733df40..d2c46454ffa8 100644 /* CDROM stuff */ case CDROMPAUSE: case CDROMRESUME: -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index 2daa5b84abbc..5fe9e899d2a6 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -192,6 +192,7 @@ static int print_unex = 1; @@ -399,7 +396,7 @@ index 2daa5b84abbc..5fe9e899d2a6 100644 /* * PS/2 floppies have much slower step rates than regular floppies. -@@ -3569,6 +3570,330 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, +@@ -3569,6 +3570,330 @@ static int fd_ioctl(struct block_device return ret; } @@ -730,7 +727,7 @@ index 2daa5b84abbc..5fe9e899d2a6 100644 static void __init config_types(void) { bool has_drive = false; -@@ -3885,6 +4210,9 @@ static const struct block_device_operations floppy_fops = { +@@ -3885,6 +4210,9 @@ static const struct block_device_operati .getgeo = fd_getgeo, .check_events = floppy_check_events, .revalidate_disk = floppy_revalidate, @@ -740,6 +737,3 @@ index 2daa5b84abbc..5fe9e899d2a6 100644 }; /* --- -2.20.1 - diff --git a/queue-4.9/floppy-fix-div-by-zero-in-setup_format_params.patch b/queue-4.9/floppy-fix-div-by-zero-in-setup_format_params.patch index c30faadfd51..ce2b6e50de3 100644 --- a/queue-4.9/floppy-fix-div-by-zero-in-setup_format_params.patch +++ b/queue-4.9/floppy-fix-div-by-zero-in-setup_format_params.patch @@ -29,15 +29,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 5 +++++ + drivers/block/floppy.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index 896dea296076..d39dc8807d3f 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -2114,6 +2114,9 @@ static void setup_format_params(int track) +@@ -2114,6 +2114,9 @@ static void setup_format_params(int trac raw_cmd->kernel_data = floppy_track_buffer; raw_cmd->length = 4 * F_SECT_PER_TRACK; @@ -47,7 +46,7 @@ index 896dea296076..d39dc8807d3f 100644 /* allow for about 30ms for data transport per track */ head_shift = (F_SECT_PER_TRACK + 5) / 6; -@@ -3236,6 +3239,8 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g, +@@ -3236,6 +3239,8 @@ static int set_geometry(unsigned int cmd /* sanity checking for parameters. */ if (g->sect <= 0 || g->head <= 0 || @@ -56,6 +55,3 @@ index 896dea296076..d39dc8807d3f 100644 g->track <= 0 || g->track > UDP->tracks >> STRETCH(g) || /* check if reserved bits are set */ (g->stretch & ~(FD_STRETCH | FD_SWAPSIDES | FD_SECTBASEMASK)) != 0) --- -2.20.1 - diff --git a/queue-4.9/floppy-fix-invalid-pointer-dereference-in-drive_name.patch b/queue-4.9/floppy-fix-invalid-pointer-dereference-in-drive_name.patch index b9e7e981ceb..58bc928a74b 100644 --- a/queue-4.9/floppy-fix-invalid-pointer-dereference-in-drive_name.patch +++ b/queue-4.9/floppy-fix-invalid-pointer-dereference-in-drive_name.patch @@ -29,15 +29,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 11 ++++++++--- + drivers/block/floppy.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index 945f93d1ffe7..d651e4309371 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -3384,7 +3384,8 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo) +@@ -3384,7 +3384,8 @@ static int fd_getgeo(struct block_device return 0; } @@ -47,7 +46,7 @@ index 945f93d1ffe7..d651e4309371 100644 { size_t floppy_type_size = ARRAY_SIZE(floppy_type); size_t i = 0; -@@ -3395,6 +3396,9 @@ static bool valid_floppy_drive_params(const short autodetect[8]) +@@ -3395,6 +3396,9 @@ static bool valid_floppy_drive_params(co return false; } @@ -57,7 +56,7 @@ index 945f93d1ffe7..d651e4309371 100644 return true; } -@@ -3524,7 +3528,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int +@@ -3524,7 +3528,8 @@ static int fd_locked_ioctl(struct block_ SUPBOUND(size, strlen((const char *)outparam) + 1); break; case FDSETDRVPRM: @@ -76,6 +75,3 @@ index 945f93d1ffe7..d651e4309371 100644 return -EINVAL; mutex_lock(&floppy_mutex); UDP->cmos = v.cmos; --- -2.20.1 - diff --git a/queue-4.9/floppy-fix-out-of-bounds-read-in-copy_buffer.patch b/queue-4.9/floppy-fix-out-of-bounds-read-in-copy_buffer.patch index aac07d7df1d..fa0e1e5b1e7 100644 --- a/queue-4.9/floppy-fix-out-of-bounds-read-in-copy_buffer.patch +++ b/queue-4.9/floppy-fix-out-of-bounds-read-in-copy_buffer.patch @@ -26,15 +26,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 6 ++++-- + drivers/block/floppy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index d651e4309371..6930abef42b3 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -3237,8 +3237,10 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g, +@@ -3237,8 +3237,10 @@ static int set_geometry(unsigned int cmd int cnt; /* sanity checking for parameters. */ @@ -47,6 +46,3 @@ index d651e4309371..6930abef42b3 100644 /* check for zero in F_SECT_PER_TRACK */ (unsigned char)((g->sect << 2) >> FD_SIZECODE(g)) == 0 || g->track <= 0 || g->track > UDP->tracks >> STRETCH(g) || --- -2.20.1 - diff --git a/queue-4.9/floppy-fix-out-of-bounds-read-in-next_valid_format.patch b/queue-4.9/floppy-fix-out-of-bounds-read-in-next_valid_format.patch index d9680a431ad..603e3cc8de9 100644 --- a/queue-4.9/floppy-fix-out-of-bounds-read-in-next_valid_format.patch +++ b/queue-4.9/floppy-fix-out-of-bounds-read-in-next_valid_format.patch @@ -27,15 +27,14 @@ Signed-off-by: Denis Efremov Tested-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/block/floppy.c | 18 ++++++++++++++++++ + drivers/block/floppy.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index d39dc8807d3f..945f93d1ffe7 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c -@@ -3384,6 +3384,20 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo) +@@ -3384,6 +3384,20 @@ static int fd_getgeo(struct block_device return 0; } @@ -56,7 +55,7 @@ index d39dc8807d3f..945f93d1ffe7 100644 static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long param) { -@@ -3510,6 +3524,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int +@@ -3510,6 +3524,8 @@ static int fd_locked_ioctl(struct block_ SUPBOUND(size, strlen((const char *)outparam) + 1); break; case FDSETDRVPRM: @@ -74,6 +73,3 @@ index d39dc8807d3f..945f93d1ffe7 100644 mutex_lock(&floppy_mutex); UDP->cmos = v.cmos; UDP->max_dtr = v.max_dtr; --- -2.20.1 - diff --git a/queue-4.9/take-floppy-compat-ioctls-to-sodding-floppy.c.patch b/queue-4.9/take-floppy-compat-ioctls-to-sodding-floppy.c.patch index 19d64711a3d..4be688a0e0d 100644 --- a/queue-4.9/take-floppy-compat-ioctls-to-sodding-floppy.c.patch +++ b/queue-4.9/take-floppy-compat-ioctls-to-sodding-floppy.c.patch @@ -10,13 +10,12 @@ biarch. Signed-off-by: Al Viro Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - block/compat_ioctl.c | 340 ----------------------------------------- - drivers/block/floppy.c | 328 +++++++++++++++++++++++++++++++++++++++ + block/compat_ioctl.c | 340 ------------------------------------------------- + drivers/block/floppy.c | 328 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 328 insertions(+), 340 deletions(-) -diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c -index 556826ac7cb4..3c9fdd6983aa 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -4,7 +4,6 @@ @@ -27,7 +26,7 @@ index 556826ac7cb4..3c9fdd6983aa 100644 #include #include #include -@@ -209,318 +208,6 @@ static int compat_blkpg_ioctl(struct block_device *bdev, fmode_t mode, +@@ -209,318 +208,6 @@ static int compat_blkpg_ioctl(struct blo #define BLKBSZSET_32 _IOW(0x12, 113, int) #define BLKGETSIZE64_32 _IOR(0x12, 114, int) @@ -346,7 +345,7 @@ index 556826ac7cb4..3c9fdd6983aa 100644 static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, unsigned long arg) { -@@ -537,16 +224,6 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, +@@ -537,16 +224,6 @@ static int compat_blkdev_driver_ioctl(st case HDIO_GET_ADDRESS: case HDIO_GET_BUSSTATE: return compat_hdio_ioctl(bdev, mode, cmd, arg); @@ -363,7 +362,7 @@ index 556826ac7cb4..3c9fdd6983aa 100644 case CDROMREADAUDIO: return compat_cdrom_read_audio(bdev, mode, cmd, arg); case CDROM_SEND_PACKET: -@@ -566,23 +243,6 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, +@@ -566,23 +243,6 @@ static int compat_blkdev_driver_ioctl(st case HDIO_DRIVE_CMD: /* 0x330 is reserved -- it used to be HDIO_GETGEO_BIG */ case 0x330: @@ -387,8 +386,6 @@ index 556826ac7cb4..3c9fdd6983aa 100644 /* CDROM stuff */ case CDROMPAUSE: case CDROMRESUME: -diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c -index 6914c6e1e1a8..896dea296076 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -192,6 +192,7 @@ static int print_unex = 1; @@ -399,7 +396,7 @@ index 6914c6e1e1a8..896dea296076 100644 /* * PS/2 floppies have much slower step rates than regular floppies. -@@ -3569,6 +3570,330 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, +@@ -3569,6 +3570,330 @@ static int fd_ioctl(struct block_device return ret; } @@ -730,7 +727,7 @@ index 6914c6e1e1a8..896dea296076 100644 static void __init config_types(void) { bool has_drive = false; -@@ -3891,6 +4216,9 @@ static const struct block_device_operations floppy_fops = { +@@ -3891,6 +4216,9 @@ static const struct block_device_operati .getgeo = fd_getgeo, .check_events = floppy_check_events, .revalidate_disk = floppy_revalidate, @@ -740,6 +737,3 @@ index 6914c6e1e1a8..896dea296076 100644 }; /* --- -2.20.1 -