diff options
| author | Miroslav Lichvar <mlichvar@redhat.com> | 2019-07-16 16:30:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-04 09:32:03 +0200 |
| commit | 650febaf6365e7960f587b292dccc5270470d794 (patch) | |
| tree | 11e7c6e72961ddc0c50024a9172ebe2460c19b13 /drivers/pps/pps.c | |
| parent | d0919216e468d5613cc8c53d4d0676026960fe39 (diff) | |
| download | linux-stable-650febaf6365e7960f587b292dccc5270470d794.tar.gz linux-stable-650febaf6365e7960f587b292dccc5270470d794.tar.bz2 linux-stable-650febaf6365e7960f587b292dccc5270470d794.zip | |
drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
commit 5515e9a6273b8c02034466bcbd717ac9f53dab99 upstream.
The PPS assert/clear offset corrections are set by the PPS_SETPARAMS
ioctl in the pps_ktime structs, which also contain flags. The flags are
not initialized by applications (using the timepps.h header) and they
are not used by the kernel for anything except returning them back in
the PPS_GETPARAMS ioctl.
Set the flags to zero to make it clear they are unused and avoid leaking
uninitialized data of the PPS_SETPARAMS caller to other applications
that have a read access to the PPS device.
Link: http://lkml.kernel.org/r/20190702092251.24303-1-mlichvar@redhat.com
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Cc: Greg KH <greg@kroah.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pps/pps.c')
| -rw-r--r-- | drivers/pps/pps.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c index 6eb0db37dd88..574b08af0d98 100644 --- a/drivers/pps/pps.c +++ b/drivers/pps/pps.c @@ -166,6 +166,14 @@ static long pps_cdev_ioctl(struct file *file, pps->params.mode |= PPS_CANWAIT; pps->params.api_version = PPS_API_VERS; + /* + * Clear unused fields of pps_kparams to avoid leaking + * uninitialized data of the PPS_SETPARAMS caller via + * PPS_GETPARAMS + */ + pps->params.assert_off_tu.flags = 0; + pps->params.clear_off_tu.flags = 0; + spin_unlock_irq(&pps->lock); break; |