From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 05/10] Add CVE .gitignore, Makefile and runtest files
Date: Fri, 19 May 2017 15:06:16 +0200 [thread overview]
Message-ID: <20170519130616.GC17258@rei.lan> (raw)
In-Reply-To: <20170519123156.8462-5-rpalethorpe@suse.com>
Hi!
> +include $(top_srcdir)/include/mk/testcases.mk
> +
> +CFLAGS += -D_GNU_SOURCE
> +
> +<<<<<<< HEAD
> +cve-2016-7117: LDFLAGS += -lpthread
> +=======
> +cve-2014-0196: LDFLAGS += -lpthread -lutil -lrt
> +cve-2016-7117: LDFLAGS += -lpthread -lrt
> +>>>>>>> 4dbfb8e79... Add -lrt
Unsolved merge conflict here and in the next file.
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2017-05-19 13:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-19 12:31 [LTP] [PATCH 01/10] Add fuzzy synchronisation library for triggering races Richard Palethorpe
2017-05-19 12:31 ` [LTP] [PATCH 02/10] Test for vulnerability CVE-2016-7117 in recvmmsg error return path Richard Palethorpe
2017-05-19 13:05 ` Cyril Hrubis
2017-05-19 12:31 ` [LTP] [PATCH 03/10] Test for CVE-2016-4997 on setsockopt Richard Palethorpe
2017-05-19 12:31 ` [LTP] [PATCH 04/10] Test for uname26 exploit CVE-2012-0957 Richard Palethorpe
2017-05-19 12:31 ` [LTP] [PATCH 05/10] Add CVE .gitignore, Makefile and runtest files Richard Palethorpe
2017-05-19 13:06 ` Cyril Hrubis [this message]
2017-05-19 12:31 ` [LTP] [PATCH 06/10] Test for CVE-2014-0196 PTY echo race Richard Palethorpe
2017-05-19 12:31 ` [LTP] [PATCH 07/10] Test for CVE-2017-5669 in shmat Richard Palethorpe
2017-05-19 12:31 ` [LTP] [PATCH 08/10] Test for CVE-2017-6951 in request_key Richard Palethorpe
2017-05-19 12:31 ` [LTP] [PATCH 09/10] Test for CVE-2017-7277 SOF_TIMESTAMPING_OPT_STATS Richard Palethorpe
2017-05-19 12:31 ` [LTP] [PATCH 10/10] Test for CVE-2017-2671 on ping sockets Richard Palethorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170519130616.GC17258@rei.lan \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.