evdev: fix off-by-one error in decode_bitset

* evdev.c (decode_bitset): Decrement sorted/indexed xlat's size by one in order to account for guarding XLAT_END, as other sorted/indexed xlat wrappers do. Fixes: v4.23~261 "evdev: support various types of xlats in decode_bitset"
2018-12-20 16:35:27 +01:00
13 changed files with 8 additions and 13 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Noteworthy changes in release 4.25 (2018-10-30)
+Noteworthy changes in release ?.?? (????-??-??)
 ===============================================

 * Improvements
--- a/evdev.c
+++ b/evdev.c
@ -208,7 +208,7 @@ decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,

 #define decode_bitset(tcp_, arg_, decode_nr_, max_nr_, dflt_, xt_) \
 	decode_bitset_((tcp_), (arg_), (decode_nr_), (max_nr_), \
-		       (dflt_), ARRAY_SIZE(decode_nr_), (xt_))
+		       (dflt_), ARRAY_SIZE(decode_nr_) - 1, (xt_))

 # ifdef EVIOCGMTSLOTS
 static int
--- a/netlink.h
+++ b/netlink.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
- * Copyright (c) 2017-2018 The strace developers.
+ * Copyright (c) 2017 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/netlink_smc_diag.c
+++ b/netlink_smc_diag.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
- * Copyright (c) 2017-2018 The strace developers.
+ * Copyright (c) 2017 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/netlink_sock_diag.c
+++ b/netlink_sock_diag.c
@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2016 Fabien Siron <fabien.siron@epita.fr>
 * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
- * Copyright (c) 2017-2018 The strace developers.
+ * Copyright (c) 2017 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/nsfs.c
+++ b/nsfs.c
@ -2,7 +2,6 @@
 * Support for decoding of NS_* ioctl commands.
 *
 * Copyright (c) 2017 Nikolay Marchuk <marchuk.nikolay.a@gmail.com>
- * Copyright (c) 2017-2018 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/rtnl_netconf.c
+++ b/rtnl_netconf.c
@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2016 Fabien Siron <fabien.siron@epita.fr>
 * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
- * Copyright (c) 2016-2018 The strace developers.
+ * Copyright (c) 2016-2017 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/tests/inotify.c
+++ b/tests/inotify.c
@ -2,7 +2,6 @@
 * Check decoding of inotify_add_watch and inotify_rm_watch syscalls.
 *
 * Copyright (c) 2016 Eugene Syromyatnikov <evgsyr@gmail.com>
- * Copyright (c) 2016-2018 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/tests/ioctl_scsi.c
+++ b/tests/ioctl_scsi.c
@ -2,7 +2,6 @@
 * Check decoding of SCSI ioctl commands.
 *
 * Copyright (c) 2017 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2017-2018 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/tests/netlink_inet_diag.c
+++ b/tests/netlink_inet_diag.c
@ -2,7 +2,7 @@
 * This file is part of inet-yy strace test.
 *
 * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2014-2018 The strace developers.
+ * Copyright (c) 2014-2017 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/tests/netlink_unix_diag.c
+++ b/tests/netlink_unix_diag.c
@ -2,7 +2,7 @@
 * This file is part of net-yy-unix strace test.
 *
 * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2014-2018 The strace developers.
+ * Copyright (c) 2014-2017 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/tests/sprintrc.c
+++ b/tests/sprintrc.c
@ -1,6 +1,5 @@
 /*
 * Copyright (c) 2016 Eugene Syromyatnikov <evgsyr@gmail.com>
- * Copyright (c) 2016-2018 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/tests/utimensat.c
+++ b/tests/utimensat.c
@ -2,7 +2,6 @@
 * Check decoding of utimensat syscall.
 *
 * Copyright (c) 2015-2017 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without