lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 055/165] USB: usbfs: don't leak kernel data in siginfo
    Date
    3.16.7-ckt9 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Alan Stern <stern@rowland.harvard.edu>

    commit f0c2b68198589249afd2b1f2c4e8de8c03e19c16 upstream.

    When a signal is delivered, the information in the siginfo structure
    is copied to userspace. Good security practice dicatates that the
    unused fields in this structure should be initialized to 0 so that
    random kernel stack data isn't exposed to the user. This patch adds
    such an initialization to the two places where usbfs raises signals.

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Reported-by: Dave Mielke <dave@mielke.cc>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/core/devio.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
    index 0b59731c3021..e500243803d8 100644
    --- a/drivers/usb/core/devio.c
    +++ b/drivers/usb/core/devio.c
    @@ -501,6 +501,7 @@ static void async_completed(struct urb *urb)
    as->status = urb->status;
    signr = as->signr;
    if (signr) {
    + memset(&sinfo, 0, sizeof(sinfo));
    sinfo.si_signo = as->signr;
    sinfo.si_errno = as->status;
    sinfo.si_code = SI_ASYNCIO;
    @@ -2371,6 +2372,7 @@ static void usbdev_remove(struct usb_device *udev)
    wake_up_all(&ps->wait);
    list_del_init(&ps->list);
    if (ps->discsignr) {
    + memset(&sinfo, 0, sizeof(sinfo));
    sinfo.si_signo = ps->discsignr;
    sinfo.si_errno = EPIPE;
    sinfo.si_code = SI_ASYNCIO;

    \
     
     \ /
      Last update: 2015-03-25 16:01    [W:4.229 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site