mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
af_key: fix buffer overread in parse_exthdrs()
commit 4e765b4972
upstream.
If a message sent to a PF_KEY socket ended with an incomplete extension
header (fewer than 4 bytes remaining), then parse_exthdrs() read past
the end of the message, into uninitialized memory. Fix it by returning
-EINVAL in this case.
Reproducer:
#include <linux/pfkeyv2.h>
#include <sys/socket.h>
#include <unistd.h>
int main()
{
int sock = socket(PF_KEY, SOCK_RAW, PF_KEY_V2);
char buf[17] = { 0 };
struct sadb_msg *msg = (void *)buf;
msg->sadb_msg_version = PF_KEY_V2;
msg->sadb_msg_type = SADB_DELETE;
msg->sadb_msg_len = 2;
write(sock, buf, 17);
}
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bee113ae1a
commit
754705d8e0
1 changed files with 3 additions and 0 deletions
|
@ -516,6 +516,9 @@ static int parse_exthdrs(struct sk_buff *skb, const struct sadb_msg *hdr, void *
|
||||||
uint16_t ext_type;
|
uint16_t ext_type;
|
||||||
int ext_len;
|
int ext_len;
|
||||||
|
|
||||||
|
if (len < sizeof(*ehdr))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
ext_len = ehdr->sadb_ext_len;
|
ext_len = ehdr->sadb_ext_len;
|
||||||
ext_len *= sizeof(uint64_t);
|
ext_len *= sizeof(uint64_t);
|
||||||
ext_type = ehdr->sadb_ext_type;
|
ext_type = ehdr->sadb_ext_type;
|
||||||
|
|
Loading…
Reference in a new issue