commit e9dde66df5f719b063aaea8acf073cbfc6952821 Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Sat Oct 14 15:38:17 2017 +0200 Linux 4.13.7 commit 3da54587cf4c1be7c26a8ae0b58313828b69638a Author: Kees Cook <keescook@chromium.org> Date: Mon Oct 9 11:36:52 2017 -0700 waitid(): Add missing access_ok() checks commit 96ca579a1ecc943b75beba58bebb0356f6cc4b51 upstream. Adds missing access_ok() checks. CVE-2017-5123 Reported-by: Chris Salls <chrissalls5@gmail.com> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Fixes: 4c48abe91be0 ("waitid(): switch copyout of siginfo to unsafe_put_user()") Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> commit ff04be02de1b371689260ab2e217a93b57ea4364 Author: Wim Van Sebroeck <wim@iguana.be> Date: Sat Sep 9 17:41:24 2017 +0200 watchdog: Revert "iTCO_wdt: all versions count down twice" commit fc61e83a29308601e6e8a0759e24fc8fe2122692 upstream. This reverts commit 1fccb73011ea8a5fa0c6d357c33fa29c695139ea. Reported as Bug 196509 - iTCO_wdt regression reboot before timeout expire Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Cc: Martin Wilck <mwilck@suse.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>