Commit e6193f78 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris

tomoyo: Check address length before reading address family

KMSAN will complain if valid address length passed to bind()/connect()/
sendmsg() is shorter than sizeof("struct sockaddr"->sa_family) bytes.
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jamorris@linux.microsoft.com>
parent e80b1859
...@@ -505,6 +505,8 @@ static int tomoyo_check_inet_address(const struct sockaddr *addr, ...@@ -505,6 +505,8 @@ static int tomoyo_check_inet_address(const struct sockaddr *addr,
{ {
struct tomoyo_inet_addr_info *i = &address->inet; struct tomoyo_inet_addr_info *i = &address->inet;
if (addr_len < offsetofend(struct sockaddr, sa_family))
return 0;
switch (addr->sa_family) { switch (addr->sa_family) {
case AF_INET6: case AF_INET6:
if (addr_len < SIN6_LEN_RFC2133) if (addr_len < SIN6_LEN_RFC2133)
...@@ -594,6 +596,8 @@ static int tomoyo_check_unix_address(struct sockaddr *addr, ...@@ -594,6 +596,8 @@ static int tomoyo_check_unix_address(struct sockaddr *addr,
{ {
struct tomoyo_unix_addr_info *u = &address->unix0; struct tomoyo_unix_addr_info *u = &address->unix0;
if (addr_len < offsetofend(struct sockaddr, sa_family))
return 0;
if (addr->sa_family != AF_UNIX) if (addr->sa_family != AF_UNIX)
return 0; return 0;
u->addr = ((struct sockaddr_un *) addr)->sun_path; u->addr = ((struct sockaddr_un *) addr)->sun_path;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment