lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 115/191] media: dvb_frontend: Add compat_ioctl callback
    Date
    From: Jaedon Shin <jaedon.shin@gmail.com>

    commit c2dfd2276cec63a0c6f6ce18ed83800d96fde542 upstream

    Adds compat_ioctl for 32-bit user space applications on a 64-bit system.

    [m.chehab@osg.samsung.com: add missing include compat.h]
    Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/dvb-core/dvb_frontend.c | 12 ++++++++++++
    fs/compat_ioctl.c | 17 -----------------
    2 files changed, 12 insertions(+), 17 deletions(-)

    diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
    index dacc467e24af2..c0a25cd6ccb8b 100644
    --- a/drivers/media/dvb-core/dvb_frontend.c
    +++ b/drivers/media/dvb-core/dvb_frontend.c
    @@ -41,6 +41,7 @@
    #include <linux/jiffies.h>
    #include <linux/kthread.h>
    #include <linux/ktime.h>
    +#include <linux/compat.h>
    #include <asm/processor.h>

    #include "dvb_frontend.h"
    @@ -1981,6 +1982,14 @@ static long dvb_frontend_ioctl(struct file *file, unsigned int cmd,
    return dvb_usercopy(file, cmd, arg, dvb_frontend_do_ioctl);
    }

    +#ifdef CONFIG_COMPAT
    +static long dvb_frontend_compat_ioctl(struct file *file, unsigned int cmd,
    + unsigned long arg)
    +{
    + return dvb_frontend_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
    +}
    +#endif
    +
    static int dtv_set_frontend(struct dvb_frontend *fe)
    {
    struct dvb_frontend_private *fepriv = fe->frontend_priv;
    @@ -2651,6 +2660,9 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)
    static const struct file_operations dvb_frontend_fops = {
    .owner = THIS_MODULE,
    .unlocked_ioctl = dvb_frontend_ioctl,
    +#ifdef CONFIG_COMPAT
    + .compat_ioctl = dvb_frontend_compat_ioctl,
    +#endif
    .poll = dvb_frontend_poll,
    .open = dvb_frontend_open,
    .release = dvb_frontend_release,
    diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
    index 02ac9067a3542..9fa3285425fef 100644
    --- a/fs/compat_ioctl.c
    +++ b/fs/compat_ioctl.c
    @@ -1340,23 +1340,6 @@ COMPATIBLE_IOCTL(DMX_GET_PES_PIDS)
    COMPATIBLE_IOCTL(DMX_GET_CAPS)
    COMPATIBLE_IOCTL(DMX_SET_SOURCE)
    COMPATIBLE_IOCTL(DMX_GET_STC)
    -COMPATIBLE_IOCTL(FE_GET_INFO)
    -COMPATIBLE_IOCTL(FE_DISEQC_RESET_OVERLOAD)
    -COMPATIBLE_IOCTL(FE_DISEQC_SEND_MASTER_CMD)
    -COMPATIBLE_IOCTL(FE_DISEQC_RECV_SLAVE_REPLY)
    -COMPATIBLE_IOCTL(FE_DISEQC_SEND_BURST)
    -COMPATIBLE_IOCTL(FE_SET_TONE)
    -COMPATIBLE_IOCTL(FE_SET_VOLTAGE)
    -COMPATIBLE_IOCTL(FE_ENABLE_HIGH_LNB_VOLTAGE)
    -COMPATIBLE_IOCTL(FE_READ_STATUS)
    -COMPATIBLE_IOCTL(FE_READ_BER)
    -COMPATIBLE_IOCTL(FE_READ_SIGNAL_STRENGTH)
    -COMPATIBLE_IOCTL(FE_READ_SNR)
    -COMPATIBLE_IOCTL(FE_READ_UNCORRECTED_BLOCKS)
    -COMPATIBLE_IOCTL(FE_SET_FRONTEND)
    -COMPATIBLE_IOCTL(FE_GET_FRONTEND)
    -COMPATIBLE_IOCTL(FE_GET_EVENT)
    -COMPATIBLE_IOCTL(FE_DISHNETWORK_SEND_LEGACY_CMD)
    COMPATIBLE_IOCTL(VIDEO_STOP)
    COMPATIBLE_IOCTL(VIDEO_PLAY)
    COMPATIBLE_IOCTL(VIDEO_FREEZE)
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:28    [W:2.185 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site