diff options
author | Paul Stewart <pstew@google.com> | 2017-02-10 00:10:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-10 00:10:17 +0000 |
commit | a96b31573c9e18cdd5feb9a448479c38e4b7ab80 (patch) | |
tree | d2c82636a75931284584c0ccb77b6284f096d3c1 | |
parent | 3341fa0db98b1f17bec2cf6dd08b50d6e3113655 (diff) | |
parent | 1ff6ec5e4092edfd244347c650cf9dd1a6d609a9 (diff) | |
download | libnl-a96b31573c9e18cdd5feb9a448479c38e4b7ab80.tar.gz |
Perform range check on len in nlmsg_reserve am: f83d9c1c67 am: d42374324d am: d9f824b744 am: 25edb109fc am: b0a4ed4800 am: 65d4de583a am: 45c4ce4768 am: 642a497f9c am: 170a7d24f4 am: 0a37ab0fddandroid-n-mr2-preview-2android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-dev
am: 1ff6ec5e40
Change-Id: I5e81524dc3a0b9fdd2e7c05fbe625ef5ab960b1f
-rw-r--r-- | lib/msg.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -518,6 +518,9 @@ void *nlmsg_reserve(struct nl_msg *n, size_t len, int pad) size_t nlmsg_len = n->nm_nlh->nlmsg_len; size_t tlen; + if (len > n->nm_size) + return NULL; + tlen = pad ? ((len + (pad - 1)) & ~(pad - 1)) : len; if ((tlen + nlmsg_len) > n->nm_size) |