lkml.org 
[lkml]   [2017]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 005/101] af_unix: Add sockaddr length checks before accessing sa_family in bind and connect handlers
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Mateusz Jurczyk <mjurczyk@google.com>


    [ Upstream commit defbcf2decc903a28d8398aa477b6881e711e3ea ]

    Verify that the caller-provided sockaddr structure is large enough to
    contain the sa_family field, before accessing it in bind() and connect()
    handlers of the AF_UNIX socket. Since neither syscall enforces a minimum
    size of the corresponding memory region, very short sockaddrs (zero or
    one byte long) result in operating on uninitialized memory while
    referencing .sa_family.

    Signed-off-by: Mateusz Jurczyk <mjurczyk@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/unix/af_unix.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/net/unix/af_unix.c
    +++ b/net/unix/af_unix.c
    @@ -997,7 +997,8 @@ static int unix_bind(struct socket *sock
    struct path path = { NULL, NULL };

    err = -EINVAL;
    - if (sunaddr->sun_family != AF_UNIX)
    + if (addr_len < offsetofend(struct sockaddr_un, sun_family) ||
    + sunaddr->sun_family != AF_UNIX)
    goto out;

    if (addr_len == sizeof(short)) {
    @@ -1108,6 +1109,10 @@ static int unix_dgram_connect(struct soc
    unsigned int hash;
    int err;

    + err = -EINVAL;
    + if (alen < offsetofend(struct sockaddr, sa_family))
    + goto out;
    +
    if (addr->sa_family != AF_UNSPEC) {
    err = unix_mkname(sunaddr, alen, &hash);
    if (err < 0)

    \
     
     \ /
      Last update: 2017-07-03 17:11    [W:7.867 / U:3.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site