From: Daniel Borkmann <dborkman@redhat.com>
To: "Toralf Förster" <toralf.foerster@gmx.de>
Cc: trinity@vger.kernel.org
Subject: Re: stupid Q : how can I derive your patch from the trinity list
Date: Tue, 28 May 2013 23:29:14 +0200 [thread overview]
Message-ID: <51A521AA.7090506@redhat.com> (raw)
In-Reply-To: <51A50F90.6040400@gmx.de>
On 05/28/2013 10:12 PM, Toralf Förster wrote:
> On 05/28/2013 09:36 PM, Daniel Borkmann wrote:
>> On 05/27/2013 10:21 AM, Daniel Borkmann wrote:
>> Just found some time to have a look into this. The issue was that the
>> trinity.h header must be included before some asm headers, then it works
>> on newer kernels.
>>
>> I've attached the updated patch. Let me know if you still encounter any
>> problems.
>
> So I just added this on top of your three patches sent out earlier:
> diff --git a/syscalls/modify_ldt.c b/syscalls/modify_ldt.c
> index a9de3a4..d601338 100644
> --- a/syscalls/modify_ldt.c
> +++ b/syscalls/modify_ldt.c
> @@ -9,7 +9,6 @@
> #define __ASSEMBLY__ 1
> #include <asm/ldt.h>
>
> -#include "trinity.h"
> #include "sanitise.h"
> #include "shm.h"
>
> and get now at a stable 32bit Gentoo Linux :
>
> CC syscalls/setreuid16.o
> syscalls/modify_ldt.c: In function ‘sanitise_modify_ldt’: CC syscalls/setuid.o
>
> syscalls/modify_ldt.c:26:3: error: implicit declaration of function ‘bdw_malloc’ [-Werror=implicit-function-declaration]
> syscalls/modify_ldt.c:26:3: error: nested extern declaration of ‘bdw_malloc’ [-Werror=nested-externs]
> syscalls/modify_ldt.c:26:7: error: assignment makes pointer from integer without a cast [-Werror]
> cc1: all warnings being treated as errors
> make: *** [syscalls/modify_ldt.o] Error 1
> make: *** Waiting for unfinished jobs....
Yes, but this is wrong, obviously. Have a look into the v3 of the patch I've
sent a couple of hours ago to you and the list (was attached in the last mail):
In syscalls/modify_ldt.c, it starts with ...
diff --git a/syscalls/modify_ldt.c b/syscalls/modify_ldt.c
index 0331a3e..93271b5 100644
--- a/syscalls/modify_ldt.c
+++ b/syscalls/modify_ldt.c
@@ -1,3 +1,4 @@
+#include "trinity.h"
#include "arch.h"
#ifdef X86
@@ -8,6 +9,7 @@
#include <sys/types.h>
#define __ASSEMBLY__ 1
#include <asm/ldt.h>
+
#include "sanitise.h"
#include "shm.h"
prev parent reply other threads:[~2013-05-28 21:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <51A1E8DB.10000@gmx.de>
[not found] ` <51A1FE73.2070807@redhat.com>
[not found] ` <51A2045D.1000402@gmx.de>
[not found] ` <51A207AB.7010706@gmx.de>
[not found] ` <51A20828.4070001@redhat.com>
2013-05-26 14:33 ` stupid Q : how can I derive your patch from the trinity list Toralf Förster
2013-05-26 14:51 ` Daniel Borkmann
2013-05-26 15:04 ` Toralf Förster
2013-05-27 8:21 ` Daniel Borkmann
2013-05-28 19:36 ` Daniel Borkmann
2013-05-28 20:12 ` Toralf Förster
2013-05-28 21:29 ` Daniel Borkmann [this message]
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=51A521AA.7090506@redhat.com \
--to=dborkman@redhat.com \
--cc=toralf.foerster@gmx.de \
--cc=trinity@vger.kernel.org \
/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.