From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762967Ab3IDPaa (ORCPT ); Wed, 4 Sep 2013 11:30:30 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:38259 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762640Ab3IDPa2 (ORCPT ); Wed, 4 Sep 2013 11:30:28 -0400 Message-ID: <1378308621.7360.110.camel@edumazet-glaptop> Subject: Re: [PATCH v3 0/3] Send audit/procinfo/cgroup data in socket-level control message From: Eric Dumazet To: Richard Guy Briggs Cc: "Eric W. Biederman" , Jan Kaluza , davem@davemloft.net, LKML , netdev@vger.kernel.org, eparis@redhat.com, tj@kernel.org, lizefan@huawei.com, containers@lists.linux-foundation.org, cgroups@vger.kernel.org, viro@zeniv.linux.org.uk Date: Wed, 04 Sep 2013 08:30:21 -0700 In-Reply-To: <20130904152022.GD28517@madcap2.tricolour.ca> References: <1377614400-27122-1-git-send-email-jkaluza@redhat.com> <1378275261-4553-1-git-send-email-jkaluza@redhat.com> <878uzdf2xp.fsf@xmission.com> <20130904145830.GC28517@madcap2.tricolour.ca> <20130904152022.GD28517@madcap2.tricolour.ca> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2013-09-04 at 11:20 -0400, Richard Guy Briggs wrote: > On Wed, Sep 04, 2013 at 10:58:30AM -0400, Richard Guy Briggs wrote: > > On Wed, Sep 04, 2013 at 12:42:26AM -0700, Eric W. Biederman wrote: > > > Jan Kaluza writes: > > > > this patchset against net-next (applies also to linux-next) adds 3 new types > > > > of "Socket"-level control message (SCM_AUDIT, SCM_PROCINFO and SCM_CGROUP). > > > > > By my count you have overflowed cb in struct sk_buff and are stomping on > > > _skb_refdest. > > > > For patch1/3 I count 56/48, then for patch3 I get 48/48. Jan, you might > > do the conversion to a pointer in patch1/3 to avoid bisect breakage. > > Wait, that __aligned(8) is for cb[48], not for the contents. > > For patch1/3 I count 28/48 on 32-bit, 36/48 on 64-bit (or would that be > 56 by default on 64-bit arches without aligned specified?), then for > patch3 I get 24/48 on 32 and 40/48 on 64 (or again 48/48 by default?). Do not count, just add this : diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 86de99a..5b61320 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1329,6 +1329,7 @@ static void unix_detach_fds(struct scm_cookie *scm, struct sk_buff *skb) { int i; + BUILD_BUG_ON(sizeof(struct unix_skb_parms) > sizeof(skb->cb)); scm->fp = UNIXCB(skb).fp; UNIXCB(skb).fp = NULL;