From: Vasiliy Kulikov <segooon@gmail.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: kernel-janitors@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Tejun Heo <tj@kernel.org>, "Serge E. Hallyn" <serge@hallyn.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: core: scm: fix information leak to userland
Date: Sat, 30 Oct 2010 14:50:42 +0000 [thread overview]
Message-ID: <20101030145042.GB25135@albatros> (raw)
In-Reply-To: <1288449205.2680.968.camel@edumazet-laptop>
On Sat, Oct 30, 2010 at 16:33 +0200, Eric Dumazet wrote:
> Le samedi 30 octobre 2010 à 18:26 +0400, Vasiliy Kulikov a écrit :
> > Structure cmsghdr is copied to userland with padding bytes
> > unitialized on architectures where __kernel_size_t is unsigned long.
> > It leads to leaking of contents of kernel stack memory.
> >
> > Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
> > ---
> > Compile tested.
> >
> > net/core/scm.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/net/core/scm.c b/net/core/scm.c
> > index 413cab8..a4a9b70 100644
> > --- a/net/core/scm.c
> > +++ b/net/core/scm.c
> > @@ -233,6 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
> > msg->msg_flags |= MSG_CTRUNC;
> > cmlen = msg->msg_controllen;
> > }
> > + memset(&cmhdr, 0, sizeof(cmhdr));
> > cmhdr.cmsg_level = level;
> > cmhdr.cmsg_type = type;
> > cmhdr.cmsg_len = cmlen;
>
>
> ???
>
> struct cmsghdr {
> __kernel_size_t cmsg_len; /* data byte count, including hdr */
> int cmsg_level; /* originating protocol */
> int cmsg_type; /* protocol-specific type */
> };
>
> Could you explain where are the padding bytes ?
Ah, sorry, nowhere :) int is stored quite OK after long. Please ignore this patch.
Thanks,
--
Vasiliy
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Vasiliy Kulikov <segooon@gmail.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: kernel-janitors@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Tejun Heo <tj@kernel.org>, "Serge E. Hallyn" <serge@hallyn.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: core: scm: fix information leak to userland
Date: Sat, 30 Oct 2010 18:50:42 +0400 [thread overview]
Message-ID: <20101030145042.GB25135@albatros> (raw)
In-Reply-To: <1288449205.2680.968.camel@edumazet-laptop>
On Sat, Oct 30, 2010 at 16:33 +0200, Eric Dumazet wrote:
> Le samedi 30 octobre 2010 à 18:26 +0400, Vasiliy Kulikov a écrit :
> > Structure cmsghdr is copied to userland with padding bytes
> > unitialized on architectures where __kernel_size_t is unsigned long.
> > It leads to leaking of contents of kernel stack memory.
> >
> > Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
> > ---
> > Compile tested.
> >
> > net/core/scm.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/net/core/scm.c b/net/core/scm.c
> > index 413cab8..a4a9b70 100644
> > --- a/net/core/scm.c
> > +++ b/net/core/scm.c
> > @@ -233,6 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
> > msg->msg_flags |= MSG_CTRUNC;
> > cmlen = msg->msg_controllen;
> > }
> > + memset(&cmhdr, 0, sizeof(cmhdr));
> > cmhdr.cmsg_level = level;
> > cmhdr.cmsg_type = type;
> > cmhdr.cmsg_len = cmlen;
>
>
> ???
>
> struct cmsghdr {
> __kernel_size_t cmsg_len; /* data byte count, including hdr */
> int cmsg_level; /* originating protocol */
> int cmsg_type; /* protocol-specific type */
> };
>
> Could you explain where are the padding bytes ?
Ah, sorry, nowhere :) int is stored quite OK after long. Please ignore this patch.
Thanks,
--
Vasiliy
next prev parent reply other threads:[~2010-10-30 14:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-30 14:26 [PATCH] net: core: scm: fix information leak to userland Vasiliy Kulikov
2010-10-30 14:26 ` Vasiliy Kulikov
2010-10-30 14:33 ` Eric Dumazet
2010-10-30 14:33 ` Eric Dumazet
2010-10-30 14:50 ` Vasiliy Kulikov [this message]
2010-10-30 14:50 ` Vasiliy Kulikov
2010-10-30 19:12 ` David Miller
2010-10-30 19:12 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101030145042.GB25135@albatros \
--to=segooon@gmail.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=eric.dumazet@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.