lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 015/107] ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
    Date
    From: Miroslav Lichvar <mlichvar@redhat.com>

    [ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ]

    If a gettime64 call fails, return the error and avoid copying data back
    to user.

    Cc: Richard Cochran <richardcochran@gmail.com>
    Cc: Jacob Keller <jacob.e.keller@intel.com>
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ptp/ptp_chardev.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
    index a421d6c551b6..ecb41eacd74b 100644
    --- a/drivers/ptp/ptp_chardev.c
    +++ b/drivers/ptp/ptp_chardev.c
    @@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
    pct->sec = ts.tv_sec;
    pct->nsec = ts.tv_nsec;
    pct++;
    - ptp->info->gettime64(ptp->info, &ts);
    + err = ptp->info->gettime64(ptp->info, &ts);
    + if (err)
    + goto out;
    pct->sec = ts.tv_sec;
    pct->nsec = ts.tv_nsec;
    pct++;
    @@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
    break;
    }

    +out:
    kfree(sysoff);
    return err;
    }
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 17:50    [W:4.323 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site