[PATCH v3 5/5] tests: add check for decoding family field of netlink GENERIC protocol

[Dmitry V. Levin]

On Tue, Jun 13, 2017 at 05:26:45PM +0900, Masatake YAMATO wrote:
> * tests/netlink_generic.c: New file.
> 
> * tests/gen_tests.in: Add netlink_generic.
> 
> * pure_executables.list: Likewise.
> 
> * tests/.gitignore: Add netlink_generic.

Please do not insert empty lines in changelog parts of commit messages.

> Signed-off-by: Masatake YAMATO <yamato at redhat.com>
> ---
>  tests/.gitignore            |  1 +
>  tests/gen_tests.in          |  1 +
>  tests/netlink_generic.c     | 80 +++++++++++++++++++++++++++++++++++++++++++++
>  tests/pure_executables.list |  1 +
>  4 files changed, 83 insertions(+)
>  create mode 100644 tests/netlink_generic.c
> 
> diff --git a/tests/.gitignore b/tests/.gitignore
> index de9fccd..bed18d3 100644
> --- a/tests/.gitignore
> +++ b/tests/.gitignore
> @@ -198,6 +198,7 @@ net-yy-inet
>  net-yy-netlink
>  net-yy-unix
>  netlink_audit
> +netlink_generic
>  netlink_inet_diag
>  netlink_netfilter
>  netlink_netlink_diag
> diff --git a/tests/gen_tests.in b/tests/gen_tests.in
> index 24a0bfa..d75fd4d 100644
> --- a/tests/gen_tests.in
> +++ b/tests/gen_tests.in
> @@ -185,6 +185,7 @@ nanosleep	-a20
>  net-icmp_filter	-e trace=getsockopt,setsockopt
>  net-sockaddr	-a24 -e trace=connect
>  netlink_audit	+netlink_sock_diag.test
> +netlink_generic	+netlink_sock_diag.test
>  netlink_netfilter	+netlink_sock_diag.test
>  netlink_protocol	-e trace=sendto
>  netlink_route	+netlink_sock_diag.test
> diff --git a/tests/netlink_generic.c b/tests/netlink_generic.c
> new file mode 100644
> index 0000000..6560eed
> --- /dev/null
> +++ b/tests/netlink_generic.c
> @@ -0,0 +1,80 @@
> +/*
> + * Copyright (c) 2017 The strace developers.
> + *
> + * 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.
> + */
> +
> +/* This test case is based on netlink_selinux.c */
> +
> +#include "tests.h"
> +#include <stdio.h>
> +#include <string.h>
> +#include <unistd.h>
> +#include <sys/socket.h>
> +#include <linux/netlink.h>
> +#include <linux/genetlink.h>

If socketutils.c includes <linux/genetlink.h> conditionally,
shouldn't the test do the same?

> +
> +static void
> +test_nlmsg_type(const int fd)
> +{
> +	/* Though GENL_ID_CTRL is statically given in this test case,
> +	 * strace doesn't have knowledge that the human readable name
> +	 * for GENL_ID_CTRL is "nlctrl". This case tests strace can
> +	 * resolve GENL_ID_CTRL as "nlctrl" from the information getting
> +	 * from run-time environment.
> +	 */
> +	long rc;
> +	struct {
> +		const struct nlmsghdr nlh;
> +		struct genlmsghdr gnlh;
> +	} req = {
> +		.nlh = {
> +			.nlmsg_len = sizeof(req),
> +			.nlmsg_type = GENL_ID_CTRL,
> +			.nlmsg_flags = NLM_F_DUMP|NLM_F_REQUEST|NLM_F_ACK,

I don't think NLM_F_ACK is needed here.


-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20170614/eb269749/attachment.bin>