af_key: fix buffer overread in parse_exthdrs()
Subsystems (4)
PATCH 1/1 af_key: fix buffer overread in parse_exthdrs()
From: Eric Biggers <[email protected]>
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 <[email protected]>
--- net/key/af_key.c | 3 +++ 1 file changed, 3 insertions(+)
net/key/af_key.c +3 -0
@@ -516,6 +516,9 @@ static int parse_exthdrs(struct sk_buff *skb, const struct sadb_msg *hdr, void *uint16_t ext_type;int ext_len; +if (len <sizeof (*ehdr)) +return -EINVAL ; + ext_len = ehdr->sadb_ext_len; ext_len *=sizeof (uint64_t ); ext_type = ehdr->sadb_ext_type;
Signature · 1 line
2.15.1
Steffen Klassert
maintainerQuoted 26 lines · Eric Biggers
From: Eric Biggers <[email protected]>
If a message sent to a
PF_KEYsocket ended with an incomplete extension header (fewer than 4 bytes remaining), thenparse_exthdrs()read past the end of the message, into uninitialized memory. Fix it by returning-EINVALin 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); }
Quoted 2 lines
Signed-off-by Eric Biggers <[email protected]>
Also applied to the ipsec tree, thanks a lot!