From patchwork Mon Aug 8 17:50:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 1664662 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=BBo4+n24; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4M1kJh31mfz9sGR for ; Tue, 9 Aug 2022 03:51:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243624AbiHHRuf (ORCPT ); Mon, 8 Aug 2022 13:50:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243659AbiHHRue (ORCPT ); Mon, 8 Aug 2022 13:50:34 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39614E10 for ; Mon, 8 Aug 2022 10:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659981033; x=1691517033; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fiHmKJYXSjL2yyY0O5s6hyYvpUr+4UEGwAxKOYJViHs=; b=BBo4+n24PtFbEQz+knyvBg8AR8/zw3cQGA/3/CEQ+MmLeB7ZcrO9Fnol l8BS9iEQ51MDr2gBxhp7dIn8j9NXXk33uW1fh5kL3qgjKIX/dhyZPuA8b BAalaA7UhbJK77e5p3oD50NmoeYgdbal+Fj1qaqg3pqZiFim3FIOjax01 lCXapKEVUKyAKVCVdvUt3Z/3PS1+fBvWzkr0/xPX5nM3xg3PVR8hmpr0y eNSt+fd/OOl/n5gMoaqND+q0Q3dOP+7lSrk0uw1dfwZH+tMgQnN9uHuFr 07WjKf7+0MmBHn/biN/QDABE6LrVv3mtX05mw0cbz4qmjjA4xOE/sDYLk w==; X-IronPort-AV: E=McAfee;i="6400,9594,10433"; a="316574602" X-IronPort-AV: E=Sophos;i="5.93,222,1654585200"; d="scan'208";a="316574602" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Aug 2022 10:50:30 -0700 X-IronPort-AV: E=Sophos;i="5.93,222,1654585200"; d="scan'208";a="632993975" Received: from jekeller-desk.amr.corp.intel.com (HELO jekeller-desk.jekeller.internal) ([10.166.241.7]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Aug 2022 10:50:30 -0700 From: Jacob Keller To: Netfilter Devel Cc: Duncan Roe , Pablo Neira Ayuso , Jacob Keller Subject: [PATCH libmnl v3 2/2] libmnl: add support for signed types Date: Mon, 8 Aug 2022 10:50:20 -0700 Message-Id: <20220808175020.2983706-2-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.37.1.208.ge72d93e88cb2 In-Reply-To: <20220808175020.2983706-1-jacob.e.keller@intel.com> References: <20220808175020.2983706-1-jacob.e.keller@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org libmnl has get and put functions for unsigned integer types. It lacks support for the signed variations. On some level this is technically sufficient. A user could use the unsigned variations and then cast to a signed value at use. However, this makes resulting code in the application more difficult to follow. Introduce signed variations of the integer get and put functions. Signed-off-by: Jacob Keller --- Changes since v2 * Fixed the ABI breakage (oops!) include/libmnl/libmnl.h | 16 ++++ src/attr.c | 194 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 209 insertions(+), 1 deletion(-) diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h index 4bd0b92e8742..ccee4948ff2f 100644 --- a/include/libmnl/libmnl.h +++ b/include/libmnl/libmnl.h @@ -92,6 +92,10 @@ extern uint8_t mnl_attr_get_u8(const struct nlattr *attr); extern uint16_t mnl_attr_get_u16(const struct nlattr *attr); extern uint32_t mnl_attr_get_u32(const struct nlattr *attr); extern uint64_t mnl_attr_get_u64(const struct nlattr *attr); +extern int8_t mnl_attr_get_s8(const struct nlattr *attr); +extern int16_t mnl_attr_get_s16(const struct nlattr *attr); +extern int32_t mnl_attr_get_s32(const struct nlattr *attr); +extern int64_t mnl_attr_get_s64(const struct nlattr *attr); extern const char *mnl_attr_get_str(const struct nlattr *attr); /* TLV attribute putters */ @@ -100,6 +104,10 @@ extern void mnl_attr_put_u8(struct nlmsghdr *nlh, uint16_t type, uint8_t data); extern void mnl_attr_put_u16(struct nlmsghdr *nlh, uint16_t type, uint16_t data); extern void mnl_attr_put_u32(struct nlmsghdr *nlh, uint16_t type, uint32_t data); extern void mnl_attr_put_u64(struct nlmsghdr *nlh, uint16_t type, uint64_t data); +extern void mnl_attr_put_s8(struct nlmsghdr *nlh, uint16_t type, int8_t data); +extern void mnl_attr_put_s16(struct nlmsghdr *nlh, uint16_t type, int16_t data); +extern void mnl_attr_put_s32(struct nlmsghdr *nlh, uint16_t type, int32_t data); +extern void mnl_attr_put_s64(struct nlmsghdr *nlh, uint16_t type, int64_t data); extern void mnl_attr_put_str(struct nlmsghdr *nlh, uint16_t type, const char *data); extern void mnl_attr_put_strz(struct nlmsghdr *nlh, uint16_t type, const char *data); @@ -109,6 +117,10 @@ extern bool mnl_attr_put_u8_check(struct nlmsghdr *nlh, size_t buflen, uint16_t extern bool mnl_attr_put_u16_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, uint16_t data); extern bool mnl_attr_put_u32_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, uint32_t data); extern bool mnl_attr_put_u64_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, uint64_t data); +extern bool mnl_attr_put_s8_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, int8_t data); +extern bool mnl_attr_put_s16_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, int16_t data); +extern bool mnl_attr_put_s32_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, int32_t data); +extern bool mnl_attr_put_s64_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, int64_t data); extern bool mnl_attr_put_str_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, const char *data); extern bool mnl_attr_put_strz_check(struct nlmsghdr *nlh, size_t buflen, uint16_t type, const char *data); @@ -134,6 +146,10 @@ enum mnl_attr_data_type { MNL_TYPE_NESTED_COMPAT, MNL_TYPE_NUL_STRING, MNL_TYPE_BINARY, + MNL_TYPE_S8, + MNL_TYPE_S16, + MNL_TYPE_S32, + MNL_TYPE_S64, MNL_TYPE_MAX, }; diff --git a/src/attr.c b/src/attr.c index 20d48a370524..2f31ecbe8f7a 100644 --- a/src/attr.c +++ b/src/attr.c @@ -203,6 +203,10 @@ static const size_t mnl_attr_data_type_len[MNL_TYPE_MAX] = { [MNL_TYPE_U16] = sizeof(uint16_t), [MNL_TYPE_U32] = sizeof(uint32_t), [MNL_TYPE_U64] = sizeof(uint64_t), + [MNL_TYPE_S8] = sizeof(int8_t), + [MNL_TYPE_S16] = sizeof(int16_t), + [MNL_TYPE_S32] = sizeof(int32_t), + [MNL_TYPE_S64] = sizeof(int64_t), [MNL_TYPE_MSECS] = sizeof(uint64_t), }; @@ -390,7 +394,55 @@ EXPORT_SYMBOL uint64_t mnl_attr_get_u64(const struct nlattr *attr) } /** - * mnl_attr_get_str - get pointer to string attribute + * mnl_attr_get_s8 - get 8-bit signed integer attribute payload + * \param attr pointer to netlink attribute + * + * \return 8-bit value of the attribute payload + */ +EXPORT_SYMBOL int8_t mnl_attr_get_s8(const struct nlattr *attr) +{ + return *((int8_t *)mnl_attr_get_payload(attr)); +} + +/** + * mnl_attr_get_s16 - get 16-bit signed integer attribute payload + * \param attr pointer to netlink attribute + * + * \return 16-bit value of the attribute payload + */ +EXPORT_SYMBOL int16_t mnl_attr_get_s16(const struct nlattr *attr) +{ + return *((int16_t *)mnl_attr_get_payload(attr)); +} + +/** + * mnl_attr_get_s32 - get 32-bit signed integer attribute payload + * \param attr pointer to netlink attribute + * + * \return 32-bit value of the attribute payload + */ +EXPORT_SYMBOL int32_t mnl_attr_get_s32(const struct nlattr *attr) +{ + return *((int32_t *)mnl_attr_get_payload(attr)); +} + +/** + * mnl_attr_get_s64 - get 64-bit signed integer attribute payload + * \param attr pointer to netlink attribute + * + * This function reads the 64-bit nlattr payload in an alignment safe manner. + * + * \return 64-bit value of the attribute payload + */ +EXPORT_SYMBOL int64_t mnl_attr_get_s64(const struct nlattr *attr) +{ + int64_t tmp; + memcpy(&tmp, mnl_attr_get_payload(attr), sizeof(tmp)); + return tmp; +} + +/** + * mnl_attr_get_str - get pointer to string attribute * \param attr pointer to netlink attribute * * \return string pointer of the attribute payload @@ -487,6 +539,66 @@ EXPORT_SYMBOL void mnl_attr_put_u64(struct nlmsghdr *nlh, uint16_t type, mnl_attr_put(nlh, type, sizeof(uint64_t), &data); } +/** + * mnl_attr_put_s8 - add 8-bit signed integer attribute to netlink message + * \param nlh pointer to the netlink message + * \param type netlink attribute type + * \param data 8-bit signed integer data that is stored by the new attribute + * + * This function updates the length field of the Netlink message (nlmsg_len) + * by adding the size (header + payload) of the new attribute. + */ +EXPORT_SYMBOL void mnl_attr_put_s8(struct nlmsghdr *nlh, uint16_t type, + int8_t data) +{ + mnl_attr_put(nlh, type, sizeof(int8_t), &data); +} + +/** + * mnl_attr_put_s16 - add 16-bit signed integer attribute to netlink message + * \param nlh pointer to the netlink message + * \param type netlink attribute type + * \param data 16-bit signed integer data that is stored by the new attribute + * + * This function updates the length field of the Netlink message (nlmsg_len) + * by adding the size (header + payload) of the new attribute. + */ +EXPORT_SYMBOL void mnl_attr_put_s16(struct nlmsghdr *nlh, uint16_t type, + int16_t data) +{ + mnl_attr_put(nlh, type, sizeof(int16_t), &data); +} + +/** + * mnl_attr_put_s32 - add 32-bit signed integer attribute to netlink message + * \param nlh pointer to the netlink message + * \param type netlink attribute type + * \param data 32-bit signed integer data that is stored by the new attribute + * + * This function updates the length field of the Netlink message (nlmsg_len) + * by adding the size (header + payload) of the new attribute. + */ +EXPORT_SYMBOL void mnl_attr_put_s32(struct nlmsghdr *nlh, uint16_t type, + int32_t data) +{ + mnl_attr_put(nlh, type, sizeof(int32_t), &data); +} + +/** + * mnl_attr_put_s64 - add 64-bit signed integer attribute to netlink message + * \param nlh pointer to the netlink message + * \param type netlink attribute type + * \param data 64-bit signed integer data that is stored by the new attribute + * + * This function updates the length field of the Netlink message (nlmsg_len) + * by adding the size (header + payload) of the new attribute. + */ +EXPORT_SYMBOL void mnl_attr_put_s64(struct nlmsghdr *nlh, uint16_t type, + int64_t data) +{ + mnl_attr_put(nlh, type, sizeof(int64_t), &data); +} + /** * mnl_attr_put_str - add string attribute to netlink message * \param nlh pointer to the netlink message @@ -647,6 +759,86 @@ EXPORT_SYMBOL bool mnl_attr_put_u64_check(struct nlmsghdr *nlh, size_t buflen, return mnl_attr_put_check(nlh, buflen, type, sizeof(uint64_t), &data); } +/** + * mnl_attr_put_s8_check - add 8-bit signed int attribute to netlink message + * \param nlh pointer to the netlink message + * \param buflen size of buffer which stores the message + * \param type netlink attribute type + * \param data 8-bit signed integer data that is stored by the new attribute + * + * This function first checks that the data can be added to the message + * (fits into the buffer) and then updates the length field of the Netlink + * message (nlmsg_len) by adding the size (header + payload) of the new + * attribute. + * + * \return true if the attribute could be added, false otherwise + */ +EXPORT_SYMBOL bool mnl_attr_put_s8_check(struct nlmsghdr *nlh, size_t buflen, + uint16_t type, int8_t data) +{ + return mnl_attr_put_check(nlh, buflen, type, sizeof(data), &data); +} + +/** + * mnl_attr_put_s16_check - add 16-bit signed int attribute to netlink message + * \param nlh pointer to the netlink message + * \param buflen size of buffer which stores the message + * \param type netlink attribute type + * \param data 16-bit signed integer data that is stored by the new attribute + * + * This function first checks that the data can be added to the message + * (fits into the buffer) and then updates the length field of the Netlink + * message (nlmsg_len) by adding the size (header + payload) of the new + * attribute. + * + * \return true if the attribute could be added, false otherwise + */ +EXPORT_SYMBOL bool mnl_attr_put_s16_check(struct nlmsghdr *nlh, size_t buflen, + uint16_t type, int16_t data) +{ + return mnl_attr_put_check(nlh, buflen, type, sizeof(data), &data); +} + +/** + * mnl_attr_put_s32_check - add 32-bit signed int attribute to netlink message + * \param nlh pointer to the netlink message + * \param buflen size of buffer which stores the message + * \param type netlink attribute type + * \param data 32-bit signed integer data that is stored by the new attribute + * + * This function first checks that the data can be added to the message + * (fits into the buffer) and then updates the length field of the Netlink + * message (nlmsg_len) by adding the size (header + payload) of the new + * attribute. + * + * \return true if the attribute could be added, false otherwise + */ +EXPORT_SYMBOL bool mnl_attr_put_s32_check(struct nlmsghdr *nlh, size_t buflen, + uint16_t type, int32_t data) +{ + return mnl_attr_put_check(nlh, buflen, type, sizeof(data), &data); +} + +/** + * mnl_attr_put_s64_check - add 64-bit signed int attribute to netlink message + * \param nlh pointer to the netlink message + * \param buflen size of buffer which stores the message + * \param type netlink attribute type + * \param data 64-bit signed integer data that is stored by the new attribute + * + * This function first checks that the data can be added to the message + * (fits into the buffer) and then updates the length field of the Netlink + * message (nlmsg_len) by adding the size (header + payload) of the new + * attribute. + * + * \return true if the attribute could be added, false otherwise + */ +EXPORT_SYMBOL bool mnl_attr_put_s64_check(struct nlmsghdr *nlh, size_t buflen, + uint16_t type, int64_t data) +{ + return mnl_attr_put_check(nlh, buflen, type, sizeof(data), &data); +} + /** * mnl_attr_put_str_check - add string attribute to netlink message * \param nlh pointer to the netlink message