diff options
| author | Al Viro | 2017-03-25 05:43:43 +0100 |
|---|---|---|
| committer | Al Viro | 2017-04-03 07:06:53 +0200 |
| commit | 2b5efc089769cd2aa583880d29416d00e7441f39 (patch) | |
| tree | 66c456dea9b6473063797d7499c6d77f5d2e964f /arch/alpha | |
| parent | Linux 4.11-rc1 (diff) | |
| download | kernel-qcow2-linux-2b5efc089769cd2aa583880d29416d00e7441f39.tar.gz kernel-qcow2-linux-2b5efc089769cd2aa583880d29416d00e7441f39.tar.xz kernel-qcow2-linux-2b5efc089769cd2aa583880d29416d00e7441f39.zip | |
alpha: fix stack smashing in old_adjtimex(2)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 0b961093ca5c..6d76e528ab8f 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1290,7 +1290,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) /* copy relevant bits of struct timex. */ if (copy_from_user(&txc, txc_p, offsetof(struct timex32, time)) || copy_from_user(&txc.tick, &txc_p->tick, sizeof(struct timex32) - - offsetof(struct timex32, time))) + offsetof(struct timex32, tick))) return -EFAULT; ret = do_adjtimex(&txc); |