From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com ([192.55.52.88]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5tEZ-0002Ad-Q1 for linux-mtd@lists.infradead.org; Thu, 14 Feb 2013 07:27:56 +0000 Message-ID: <1360826890.12703.158.camel@sauron.fi.intel.com> Subject: Re: [PATCH RFC 4/5] UBIFS: Add security.* XATTR support for the UBIFS From: Artem Bityutskiy To: Marc Kleine-Budde Date: Thu, 14 Feb 2013 09:28:10 +0200 In-Reply-To: <1360750998-15191-5-git-send-email-mkl@pengutronix.de> References: <1360750998-15191-1-git-send-email-mkl@pengutronix.de> <1360750998-15191-5-git-send-email-mkl@pengutronix.de> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Cc: linux-security-module@vger.kernel.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Subodh Nijsure Reply-To: artem.bityutskiy@linux.intel.com List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 2013-02-13 at 11:23 +0100, Marc Kleine-Budde wrote: > --- a/fs/ubifs/journal.c > +++ b/fs/ubifs/journal.c > @@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, > > dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu", > inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino); > - ubifs_assert(dir_ui->data_len == 0); > + if (!xent) > + ubifs_assert(dir_ui->data_len == 0); Shouldn't this snippet be in 2/5 instead? -- Best Regards, Artem Bityutskiy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756164Ab3BNH16 (ORCPT ); Thu, 14 Feb 2013 02:27:58 -0500 Received: from mga11.intel.com ([192.55.52.93]:33052 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752176Ab3BNH1z (ORCPT ); Thu, 14 Feb 2013 02:27:55 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,662,1355126400"; d="scan'208";a="287083345" Message-ID: <1360826890.12703.158.camel@sauron.fi.intel.com> Subject: Re: [PATCH RFC 4/5] UBIFS: Add security.* XATTR support for the UBIFS From: Artem Bityutskiy Reply-To: artem.bityutskiy@linux.intel.com To: Marc Kleine-Budde Cc: linux-mtd@lists.infradead.org, kernel@pengutronix.de, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, Subodh Nijsure Date: Thu, 14 Feb 2013 09:28:10 +0200 In-Reply-To: <1360750998-15191-5-git-send-email-mkl@pengutronix.de> References: <1360750998-15191-1-git-send-email-mkl@pengutronix.de> <1360750998-15191-5-git-send-email-mkl@pengutronix.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.6.3 (3.6.3-2.fc18) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2013-02-13 at 11:23 +0100, Marc Kleine-Budde wrote: > --- a/fs/ubifs/journal.c > +++ b/fs/ubifs/journal.c > @@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, > > dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu", > inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino); > - ubifs_assert(dir_ui->data_len == 0); > + if (!xent) > + ubifs_assert(dir_ui->data_len == 0); Shouldn't this snippet be in 2/5 instead? -- Best Regards, Artem Bityutskiy