lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 022/211] synclink_gt(): fix compat_ioctl()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    [ Upstream commit 27230e51349fde075598c1b59d15e1ff802f3f6e ]

    compat_ptr() for pointer-taking ones...

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/synclink_gt.c | 16 ++++------------
    1 file changed, 4 insertions(+), 12 deletions(-)

    diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
    index 636b8ae29b465..344e8c427c7e2 100644
    --- a/drivers/tty/synclink_gt.c
    +++ b/drivers/tty/synclink_gt.c
    @@ -1187,14 +1187,13 @@ static long slgt_compat_ioctl(struct tty_struct *tty,
    unsigned int cmd, unsigned long arg)
    {
    struct slgt_info *info = tty->driver_data;
    - int rc = -ENOIOCTLCMD;
    + int rc;

    if (sanity_check(info, tty->name, "compat_ioctl"))
    return -ENODEV;
    DBGINFO(("%s compat_ioctl() cmd=%08X\n", info->device_name, cmd));

    switch (cmd) {
    -
    case MGSL_IOCSPARAMS32:
    rc = set_params32(info, compat_ptr(arg));
    break;
    @@ -1214,18 +1213,11 @@ static long slgt_compat_ioctl(struct tty_struct *tty,
    case MGSL_IOCWAITGPIO:
    case MGSL_IOCGXSYNC:
    case MGSL_IOCGXCTRL:
    - case MGSL_IOCSTXIDLE:
    - case MGSL_IOCTXENABLE:
    - case MGSL_IOCRXENABLE:
    - case MGSL_IOCTXABORT:
    - case TIOCMIWAIT:
    - case MGSL_IOCSIF:
    - case MGSL_IOCSXSYNC:
    - case MGSL_IOCSXCTRL:
    - rc = ioctl(tty, cmd, arg);
    + rc = ioctl(tty, cmd, (unsigned long)compat_ptr(arg));
    break;
    + default:
    + rc = ioctl(tty, cmd, arg);
    }
    -
    DBGINFO(("%s compat_ioctl() cmd=%08X rc=%d\n", info->device_name, cmd, rc));
    return rc;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 22:37    [W:4.165 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site