lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/20] staging: gasket: common ioctl dispatcher add __user annotations
    Date
    From: Todd Poynor <toddpoynor@google.com>

    Add __user annotation to gasket core common ioctl pointer arguments for
    sparse checking.

    Reported-by: Dmitry Torokhov <dtor@chromium.org>
    Signed-off-by: Zhongze Hu <frankhu@chromium.org>
    Signed-off-by: Todd Poynor <toddpoynor@google.com>
    ---
    drivers/staging/gasket/gasket_ioctl.c | 8 +++++---
    drivers/staging/gasket/gasket_ioctl.h | 4 +++-
    2 files changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/staging/gasket/gasket_ioctl.c b/drivers/staging/gasket/gasket_ioctl.c
    index 8fd44979fe713..998d0e215523c 100644
    --- a/drivers/staging/gasket/gasket_ioctl.c
    +++ b/drivers/staging/gasket/gasket_ioctl.c
    @@ -7,6 +7,7 @@
    #include "gasket_interrupt.h"
    #include "gasket_logging.h"
    #include "gasket_page_table.h"
    +#include <linux/compiler.h>
    #include <linux/fs.h>
    #include <linux/uaccess.h>

    @@ -39,13 +40,14 @@ static int gasket_config_coherent_allocator(
    * standard ioctl dispatch function.
    * @filp: File structure pointer describing this node usage session.
    * @cmd: ioctl number to handle.
    - * @arg: ioctl-specific data pointer.
    + * @argp: ioctl-specific data pointer.
    *
    * Standard ioctl dispatcher; forwards operations to individual handlers.
    */
    -long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg)
    +long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp)
    {
    struct gasket_dev *gasket_dev;
    + unsigned long arg = (unsigned long)argp;
    int retval;

    gasket_dev = (struct gasket_dev *)filp->private_data;
    @@ -53,7 +55,7 @@ long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg)

    if (gasket_get_ioctl_permissions_cb(gasket_dev)) {
    retval = gasket_get_ioctl_permissions_cb(gasket_dev)(
    - filp, cmd, arg);
    + filp, cmd, argp);
    if (retval < 0) {
    trace_gasket_ioctl_exit(-EPERM);
    return retval;
    diff --git a/drivers/staging/gasket/gasket_ioctl.h b/drivers/staging/gasket/gasket_ioctl.h
    index 461fab27a3e52..51f468c77f041 100644
    --- a/drivers/staging/gasket/gasket_ioctl.h
    +++ b/drivers/staging/gasket/gasket_ioctl.h
    @@ -5,6 +5,8 @@

    #include "gasket_core.h"

    +#include <linux/compiler.h>
    +
    /*
    * Handle Gasket common ioctls.
    * @filp: Pointer to the ioctl's file.
    @@ -13,7 +15,7 @@
    *
    * Returns 0 on success and nonzero on failure.
    */
    -long gasket_handle_ioctl(struct file *filp, uint cmd, ulong arg);
    +long gasket_handle_ioctl(struct file *filp, uint cmd, void __user *argp);

    /*
    * Determines if an ioctl is part of the standard Gasket framework.
    --
    2.18.0.233.g985f88cf7e-goog
    \
     
     \ /
      Last update: 2018-07-20 05:51    [W:4.315 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site