lkml.org 
[lkml]   [2018]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 3.18 80/98] tty: audit: Fix audit source
    Date
    From: Peter Hurley <peter@hurleysoftware.com>

    [ Upstream commit 6b2a3d628aa752f0ab825fc6d4d07b09e274d1c1 ]

    The data to audit/record is in the 'from' buffer (ie., the input
    read buffer).

    Fixes: 72586c6061ab ("n_tty: Fix auditing support for cannonical mode")
    Cc: stable <stable@vger.kernel.org> # 4.1+
    Cc: Miloslav Trmač <mitr@redhat.com>
    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Acked-by: Laura Abbott <labbott@fedoraproject.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/n_tty.c | 2 +-
    drivers/tty/tty_audit.c | 2 +-
    include/linux/tty.h | 6 +++---
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
    index 0ed99ad74bee..f53682bb30cf 100644
    --- a/drivers/tty/n_tty.c
    +++ b/drivers/tty/n_tty.c
    @@ -195,7 +195,7 @@ static inline int tty_copy_to_user(struct tty_struct *tty,
    {
    struct n_tty_data *ldata = tty->disc_data;

    - tty_audit_add_data(tty, to, n, ldata->icanon);
    + tty_audit_add_data(tty, from, n, ldata->icanon);
    return copy_to_user(to, from, n);
    }

    diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
    index 90ca082935f6..3d245cd3d8e6 100644
    --- a/drivers/tty/tty_audit.c
    +++ b/drivers/tty/tty_audit.c
    @@ -265,7 +265,7 @@ static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
    *
    * Audit @data of @size from @tty, if necessary.
    */
    -void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
    +void tty_audit_add_data(struct tty_struct *tty, const void *data,
    size_t size, unsigned icanon)
    {
    struct tty_audit_buf *buf;
    diff --git a/include/linux/tty.h b/include/linux/tty.h
    index 4858a3b79b7a..47d0bfa536e7 100644
    --- a/include/linux/tty.h
    +++ b/include/linux/tty.h
    @@ -587,7 +587,7 @@ extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops);

    /* tty_audit.c */
    #ifdef CONFIG_AUDIT
    -extern void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
    +extern void tty_audit_add_data(struct tty_struct *tty, const void *data,
    size_t size, unsigned icanon);
    extern void tty_audit_exit(void);
    extern void tty_audit_fork(struct signal_struct *sig);
    @@ -595,8 +595,8 @@ extern void tty_audit_tiocsti(struct tty_struct *tty, char ch);
    extern void tty_audit_push(struct tty_struct *tty);
    extern int tty_audit_push_current(void);
    #else
    -static inline void tty_audit_add_data(struct tty_struct *tty,
    - unsigned char *data, size_t size, unsigned icanon)
    +static inline void tty_audit_add_data(struct tty_struct *tty, const void *data,
    + size_t size, unsigned icanon)
    {
    }
    static inline void tty_audit_tiocsti(struct tty_struct *tty, char ch)
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-25 16:26    [W:3.135 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site