Add a source file where EXTATTR checks will happen and hook it in even

if it doesn't do anything yet.

Sponsored by: DARPA & NAI Labs.

4 files changed, 93 insertions, 2 deletions

diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index 8977b3d..d5e504c 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -5,8 +5,8 @@ PROG=	fsck_ffs
 LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
 LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
 MAN=	fsck_ffs.8
-SRCS=	dir.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
-	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
+SRCS=	dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \
+	pass4.c pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}
 
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
new file mode 100644
index 0000000..d78f11e
--- /dev/null
+++ b/sbin/fsck_ffs/ea.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2002 Poul-Henning Kamp
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * This software was developed for the FreeBSD Project by Poul-Henning Kamp
+ * and NAI Labs, the Security Research Division of Network Associates, Inc.
+ * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+ * DARPA CHATS research program.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The names of the authors may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/stdint.h>
+
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
+
+#include <err.h>
+#include <string.h>
+
+#include "fsck.h"
+
+/*
+ * Scan each entry in an ea block.
+ */
+int
+eascan(struct inodesc *idesc, struct ufs2_dinode *dp)
+{
+#if 1
+	return (0);
+#else
+	struct bufarea *bp;
+	u_int dsize, n;
+	u_char *cp;
+	long blksiz;
+	char dbuf[DIRBLKSIZ];
+
+	printf("Inode %ju extsize %ju\n",
+	   (intmax_t)idesc->id_number, (intmax_t)dp->di_extsize);
+	if (dp->di_extsize == 0)
+		return 0;
+	if (dp->di_extsize <= sblock.fs_fsize)
+		blksiz = sblock.fs_fsize;
+	else
+		blksiz = sblock.fs_bsize;
+	printf("blksiz = %ju\n", (intmax_t)blksiz);
+	bp = getdatablk(dp->di_extb[0], blksiz);
+	cp = (u_char *)bp->b_un.b_buf;
+	for (n = 0; n < blksiz; n++) {
+		printf("%02x", cp[n]);
+		if ((n & 31) == 31)
+			printf("\n");
+	}
+	return (STOP);
+#endif
+}
+
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 1fd0c89..62c7de3 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -307,6 +307,7 @@ int		clearentry(struct inodesc *);
 void		direrror(ino_t ino, const char *errmesg);
 int		dirscan(struct inodesc *);
 int		dofix(struct inodesc *, const char *msg);
+int		eascan(struct inodesc *, struct ufs2_dinode *dp);
 void		ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t);
 void		ffs_fragacct(struct fs *, int, int32_t [], int);
 int		ffs_isblock(struct fs *, u_char *, ufs1_daddr_t);
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 38506a9..a66690c 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -331,6 +331,8 @@ checkinode(ino_t inumber, struct inodesc *idesc)
 	else
 		idesc->id_type = ADDR;
 	(void)ckinode(dp, idesc);
+	if (sblock.fs_magic == FS_UFS2_MAGIC)
+		eascan(idesc, &dp->dp2);
 	idesc->id_entryno *= btodb(sblock.fs_fsize);
 	if (DIP(dp, di_blocks) != idesc->id_entryno) {
 		pwarn("INCORRECT BLOCK COUNT I=%lu (%ju should be %ju)",