* configure.ac (AC_CHECK_DECLS): Add CRYPTO_MSG_DELRNG. * netlink_crypto.c: New file. * Makefile.am (strace_SOURCES): Add it. * defs.h (decode_netlink_crypto): New prototype. * netlink.c (netlink_decoders): Add NETLINK_CRYPTO. * xlat/crypto_nl_attrs.in: New file. --- Makefile.am | 1 + configure.ac | 1 + defs.h | 3 ++ netlink.c | 3 ++ netlink_crypto.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ xlat/crypto_nl_attrs.in | 12 +++++++ 6 files changed, 112 insertions(+) create mode 100644 netlink_crypto.c create mode 100644 xlat/crypto_nl_attrs.in
diff --git a/Makefile.am b/Makefile.am index 8411f26..5d365e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -183,6 +183,7 @@ strace_SOURCES = \ net.c \ netlink.c \ netlink.h \ + netlink_crypto.c \ netlink_sock_diag.h \ netlink_inet_diag.c \ netlink_netlink_diag.c \ diff --git a/configure.ac b/configure.ac index 4f5bc02..2c6e254 100644 --- a/configure.ac +++ b/configure.ac @@ -520,6 +520,7 @@ AC_CHECK_DECLS(m4_normalize([ ]),,, [#include <linux/loop.h>]) AC_CHECK_DECLS(m4_normalize([ + CRYPTO_MSG_DELRNG, CTL_PROC, CTL_ARLAN, CTL_S390DBF, diff --git a/defs.h b/defs.h index 4048915..9d99575 100644 --- a/defs.h +++ b/defs.h @@ -711,6 +711,9 @@ typedef bool (*netlink_decoder_t)(struct tcb *, const struct nlmsghdr *, extern bool \ decode_netlink_ ## name(struct tcb *, const struct nlmsghdr *, \ kernel_ulong_t addr, unsigned int len) +#ifdef HAVE_LINUX_CRYPTOUSER_H +DECL_NETLINK(crypto); +#endif DECL_NETLINK(selinux); DECL_NETLINK(sock_diag); diff --git a/netlink.c b/netlink.c index b9ad7d2..947e52d 100644 --- a/netlink.c +++ b/netlink.c @@ -380,6 +380,9 @@ decode_nlmsgerr(struct tcb *const tcp, } static const netlink_decoder_t netlink_decoders[] = { +#ifdef HAVE_LINUX_CRYPTOUSER_H + [NETLINK_CRYPTO] = decode_netlink_crypto, +#endif [NETLINK_SELINUX] = decode_netlink_selinux, [NETLINK_SOCK_DIAG] = decode_netlink_sock_diag }; diff --git a/netlink_crypto.c b/netlink_crypto.c new file mode 100644 index 0000000..62550b2 --- /dev/null +++ b/netlink_crypto.c @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2017 JingPiao Chen <chenjingp...@gmail.com> + * Copyright (c) 2017 The strace developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "defs.h" + +#ifdef HAVE_LINUX_CRYPTOUSER_H + +# include "netlink.h" +# include "nlattr.h" +# include "print_fields.h" +# include <linux/cryptouser.h> + +# include "xlat/crypto_nl_attrs.h" + +static void +decode_crypto_user_alg(struct tcb *const tcp, + const kernel_ulong_t addr, + const unsigned int len) +{ + struct crypto_user_alg alg; + + if (len < sizeof(alg)) + printstrn(tcp, addr, len); + else if (!umove_or_printaddr(tcp, addr, &alg)) { + PRINT_FIELD_CSTRING("{", alg, cru_name); + PRINT_FIELD_CSTRING(", ", alg, cru_driver_name); + PRINT_FIELD_CSTRING(", ", alg, cru_module_name); + PRINT_FIELD_X(", ", alg, cru_type); + PRINT_FIELD_X(", ", alg, cru_mask); + PRINT_FIELD_U(", ", alg, cru_refcnt); + PRINT_FIELD_X(", ", alg, cru_flags); + tprints("}"); + + const size_t offset = NLMSG_ALIGN(sizeof(alg)); + if (len > offset) { + tprints(", "); + decode_nlattr(tcp, addr + offset, len - offset, + crypto_nl_attrs, "CRYPTOCFGA_???", + NULL, 0, NULL); + } + } +} + +bool +decode_netlink_crypto(struct tcb *const tcp, + const struct nlmsghdr *const nlmsghdr, + const kernel_ulong_t addr, + const unsigned int len) +{ + switch (nlmsghdr->nlmsg_type) { + case CRYPTO_MSG_NEWALG: + case CRYPTO_MSG_DELALG: + case CRYPTO_MSG_UPDATEALG: + case CRYPTO_MSG_GETALG: + decode_crypto_user_alg(tcp, addr, len); + break; +#ifdef HAVE_CRYPTO_MSG_DELRNG + case CRYPTO_MSG_DELRNG: +#endif + default: + return false; + } + + return true; +} + +#endif /* HAVE_LINUX_CRYPTOUSER_H */ diff --git a/xlat/crypto_nl_attrs.in b/xlat/crypto_nl_attrs.in new file mode 100644 index 0000000..02b3662 --- /dev/null +++ b/xlat/crypto_nl_attrs.in @@ -0,0 +1,12 @@ +CRYPTOCFGA_UNSPEC 0 +CRYPTOCFGA_PRIORITY_VAL 1 +CRYPTOCFGA_REPORT_LARVAL 2 +CRYPTOCFGA_REPORT_HASH 3 +CRYPTOCFGA_REPORT_BLKCIPHER 4 +CRYPTOCFGA_REPORT_AEAD 5 +CRYPTOCFGA_REPORT_COMPRESS 6 +CRYPTOCFGA_REPORT_RNG 7 +CRYPTOCFGA_REPORT_CIPHER 8 +CRYPTOCFGA_REPORT_AKCIPHER 9 +CRYPTOCFGA_REPORT_KPP 10 +CRYPTOCFGA_REPORT_ACOMP 11 -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel