diff options
| author | Christopher Ferris <cferris@google.com> | 2019-07-08 12:42:16 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2019-07-08 12:42:16 -0700 |
| commit | 642c628abe2ebce0adf5bcb62932c29b20367152 (patch) | |
| tree | fafa9f840132f6ee2e83145a99243d9a14ca0e9c /original/uapi/linux/tipc_config.h | |
| parent | 0518a6a8d1de7cb7768bfe4af52a64e8dc4df643 (diff) | |
| download | kernel-headers-642c628abe2ebce0adf5bcb62932c29b20367152.tar.gz | |
Update to kernel headers v5.2.
Test: NA
Change-Id: I1130b586e7e9cb528a84c28002a93db6440b0e0b
Diffstat (limited to 'original/uapi/linux/tipc_config.h')
| -rw-r--r-- | original/uapi/linux/tipc_config.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/original/uapi/linux/tipc_config.h b/original/uapi/linux/tipc_config.h index 4b2c93b..4955e1a 100644 --- a/original/uapi/linux/tipc_config.h +++ b/original/uapi/linux/tipc_config.h @@ -307,8 +307,10 @@ static inline int TLV_SET(void *tlv, __u16 type, void *data, __u16 len) tlv_ptr = (struct tlv_desc *)tlv; tlv_ptr->tlv_type = htons(type); tlv_ptr->tlv_len = htons(tlv_len); - if (len && data) - memcpy(TLV_DATA(tlv_ptr), data, tlv_len); + if (len && data) { + memcpy(TLV_DATA(tlv_ptr), data, len); + memset(TLV_DATA(tlv_ptr) + len, 0, TLV_SPACE(len) - tlv_len); + } return TLV_SPACE(len); } @@ -405,8 +407,10 @@ static inline int TCM_SET(void *msg, __u16 cmd, __u16 flags, tcm_hdr->tcm_len = htonl(msg_len); tcm_hdr->tcm_type = htons(cmd); tcm_hdr->tcm_flags = htons(flags); - if (data_len && data) + if (data_len && data) { memcpy(TCM_DATA(msg), data, data_len); + memset(TCM_DATA(msg) + data_len, 0, TCM_SPACE(data_len) - msg_len); + } return TCM_SPACE(data_len); } |