All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Subject: linux-next: build failure after merge of the userns tree
Date: Mon, 24 Sep 2012 22:18:59 +1000	[thread overview]
Message-ID: <20120924221859.b3f8fbc112ed7ff305b93512@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

Hi Eric,

After merging the userns tree, today's linux-next build (x86_64
allmodconfig) failed like this:

kernel/audit.c: In function 'audit_receive_msg':
kernel/audit.c:753:37: error: 'struct netlink_skb_parms' has no member named 'pid'

I missed the conflict between commit 35ce9888ad2a ("audit: Properly set
the origin port id of audit messages") from the userns tree and commit
15e473046cb6 ("netlink: Rename pid to portid to avoid confusion") from
the net-next tree.  I have added the following merge fix patch and can
carry it as necessary.

From 55a9ee70146f37c559333b1f35154618c708203f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Sep 2012 22:05:38 +1000
Subject: [PATCH] audit: fix up for pid to portid change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/audit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index ea9b67a..4d0ceed 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -750,7 +750,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 					size--;
 				audit_log_n_untrustedstring(ab, data, size);
 			}
-			audit_set_pid(ab, NETLINK_CB(skb).pid);
+			audit_set_pid(ab, NETLINK_CB(skb).portid);
 			audit_log_end(ab);
 		}
 		break;
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org
Subject: linux-next: build failure after merge of the userns tree
Date: Mon, 24 Sep 2012 22:18:59 +1000	[thread overview]
Message-ID: <20120924221859.b3f8fbc112ed7ff305b93512@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

Hi Eric,

After merging the userns tree, today's linux-next build (x86_64
allmodconfig) failed like this:

kernel/audit.c: In function 'audit_receive_msg':
kernel/audit.c:753:37: error: 'struct netlink_skb_parms' has no member named 'pid'

I missed the conflict between commit 35ce9888ad2a ("audit: Properly set
the origin port id of audit messages") from the userns tree and commit
15e473046cb6 ("netlink: Rename pid to portid to avoid confusion") from
the net-next tree.  I have added the following merge fix patch and can
carry it as necessary.

From 55a9ee70146f37c559333b1f35154618c708203f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Sep 2012 22:05:38 +1000
Subject: [PATCH] audit: fix up for pid to portid change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/audit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index ea9b67a..4d0ceed 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -750,7 +750,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 					size--;
 				audit_log_n_untrustedstring(ab, data, size);
 			}
-			audit_set_pid(ab, NETLINK_CB(skb).pid);
+			audit_set_pid(ab, NETLINK_CB(skb).portid);
 			audit_log_end(ab);
 		}
 		break;
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-09-24 12:19 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24 12:18 Stephen Rothwell [this message]
2012-09-24 12:18 ` linux-next: build failure after merge of the userns tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-03-16  5:56 Stephen Rothwell
2022-03-16 13:54 ` Eric W. Biederman
2021-12-17  7:34 Stephen Rothwell
2021-12-17 16:53 ` Eric W. Biederman
2021-12-17  7:13 Stephen Rothwell
2021-10-20  3:46 Stephen Rothwell
2021-10-20 16:00 ` Eric W. Biederman
2021-10-07  3:47 Stephen Rothwell
2021-10-07 18:56 ` Eric W. Biederman
2020-05-21  8:22 Stephen Rothwell
2018-03-28  7:41 Stephen Rothwell
2018-03-28 18:32 ` Eric W. Biederman
2018-01-26  1:05 Stephen Rothwell
2018-01-26  2:45 ` Eric W. Biederman
2017-07-20  3:25 Stephen Rothwell
2017-07-20 12:17 ` Eric W. Biederman
2015-05-25 10:39 Stephen Rothwell
2014-04-17  5:12 Stephen Rothwell
2014-04-17  7:18 ` Eric W. Biederman
2014-04-22  1:34   ` Stephen Rothwell
2014-04-22  1:34     ` Stephen Rothwell
2013-11-08  7:07 Stephen Rothwell
2013-11-08 23:15 ` Eric W. Biederman
2013-11-11  5:25   ` Stephen Rothwell
2013-11-11  5:25     ` Stephen Rothwell
2013-11-08  6:58 Stephen Rothwell
2013-11-08  7:27 ` Christoph Hellwig
2013-11-08 15:55   ` Al Viro
2013-11-08 22:50   ` Eric W. Biederman
2013-11-09  8:32     ` Christoph Hellwig
2012-05-21  7:50 Stephen Rothwell
2012-05-21 22:05 ` Eric W. Biederman
2012-05-14  9:13 Stephen Rothwell
2012-05-16  1:12 ` Eric W. Biederman

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=20120924221859.b3f8fbc112ed7ff305b93512@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@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.