lkml.org 
[lkml]   [2018]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 67/81] block/swim: Dont log an error message for an invalid ioctl
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Finn Thain <fthain@telegraphics.com.au>

    commit 8e2ab5a4efaac77fb93e5b5b109d0b3976fdd3a0 upstream.

    The 'eject' shell command may send various different ioctl commands.
    This leads to error messages on the console even though the FDEJECT
    ioctl succeeds.

    ~# eject floppy
    SWIM floppy_ioctl: unknown cmd 21257
    SWIM floppy_ioctl: unknown cmd 1

    Don't log an error message for an invalid ioctl, just do as the
    swim3 driver does and return -ENOTTY.

    Cc: Laurent Vivier <lvivier@redhat.com>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: stable@vger.kernel.org # v4.14+
    Tested-by: Stan Johnson <userm57@yahoo.com>
    Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
    Acked-by: Laurent Vivier <lvivier@redhat.com>
    Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/block/swim.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    --- a/drivers/block/swim.c
    +++ b/drivers/block/swim.c
    @@ -727,14 +727,9 @@ static int floppy_ioctl(struct block_dev
    if (copy_to_user((void __user *) param, (void *) &floppy_type,
    sizeof(struct floppy_struct)))
    return -EFAULT;
    - break;
    -
    - default:
    - printk(KERN_DEBUG "SWIM floppy_ioctl: unknown cmd %d\n",
    - cmd);
    - return -ENOSYS;
    + return 0;
    }
    - return 0;
    + return -ENOTTY;
    }

    static int floppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)

    \
     
     \ /
      Last update: 2018-04-27 16:24    [W:4.594 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site