change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/fs/xfs/libxfs/xfs_dir2.c
..
..
@@ -5,20 +5,16 @@
5
5
  */
6
6
 #include "xfs.h"
7
7
 #include "xfs_fs.h"
8
+#include "xfs_shared.h"
8
9
 #include "xfs_format.h"
9
10
 #include "xfs_log_format.h"
10
11
 #include "xfs_trans_resv.h"
11
12
 #include "xfs_mount.h"
12
-#include "xfs_defer.h"
13
-#include "xfs_da_format.h"
14
-#include "xfs_da_btree.h"
15
13
 #include "xfs_inode.h"
16
14
 #include "xfs_trans.h"
17
-#include "xfs_inode_item.h"
18
15
 #include "xfs_bmap.h"
19
16
 #include "xfs_dir2.h"
20
17
 #include "xfs_dir2_priv.h"
21
-#include "xfs_ialloc.h"
22
18
 #include "xfs_errortag.h"
23
19
 #include "xfs_error.h"
24
20
 #include "xfs_trace.h"
..
..
@@ -56,7 +52,7 @@
56
52
  * ASCII case-insensitive (ie. A-Z) support for directories that was
57
53
  * used in IRIX.
58
54
  */
59
-STATIC xfs_dahash_t
55
+xfs_dahash_t
60
56
 xfs_ascii_ci_hashname(
61
57
 	struct xfs_name	*name)
62
58
 {
..
..
@@ -69,14 +65,14 @@
69
65
 	return hash;
70
66
 }
71
67
 
72
-STATIC enum xfs_dacmp
68
+enum xfs_dacmp
73
69
 xfs_ascii_ci_compname(
74
-	struct xfs_da_args *args,
75
-	const unsigned char *name,
76
-	int		len)
70
+	struct xfs_da_args	*args,
71
+	const unsigned char	*name,
72
+	int			len)
77
73
 {
78
-	enum xfs_dacmp	result;
79
-	int		i;
74
+	enum xfs_dacmp		result;
75
+	int			i;
80
76
 
81
77
 	if (args->namelen != len)
82
78
 		return XFS_CMP_DIFFERENT;
..
..
@@ -93,30 +89,20 @@
93
89
 	return result;
94
90
 }
95
91
 
96
-static const struct xfs_nameops xfs_ascii_ci_nameops = {
97
-	.hashname	= xfs_ascii_ci_hashname,
98
-	.compname	= xfs_ascii_ci_compname,
99
-};
100
-
101
92
 int
102
93
 xfs_da_mount(
103
94
 	struct xfs_mount	*mp)
104
95
 {
105
96
 	struct xfs_da_geometry	*dageo;
106
-	int			nodehdr_size;
107
97
 
108
98
 
109
99
 	ASSERT(mp->m_sb.sb_versionnum & XFS_SB_VERSION_DIRV2BIT);
110
100
 	ASSERT(xfs_dir2_dirblock_bytes(&mp->m_sb) <= XFS_MAX_BLOCKSIZE);
111
101
 
112
-	mp->m_dir_inode_ops = xfs_dir_get_ops(mp, NULL);
113
-	mp->m_nondir_inode_ops = xfs_nondir_get_ops(mp, NULL);
114
-
115
-	nodehdr_size = mp->m_dir_inode_ops->node_hdr_size;
116
102
 	mp->m_dir_geo = kmem_zalloc(sizeof(struct xfs_da_geometry),
117
-				    KM_SLEEP | KM_MAYFAIL);
103
+				    KM_MAYFAIL);
118
104
 	mp->m_attr_geo = kmem_zalloc(sizeof(struct xfs_da_geometry),
119
-				     KM_SLEEP | KM_MAYFAIL);
105
+				     KM_MAYFAIL);
120
106
 	if (!mp->m_dir_geo || !mp->m_attr_geo) {
121
107
 		kmem_free(mp->m_dir_geo);
122
108
 		kmem_free(mp->m_attr_geo);
..
..
@@ -129,6 +115,27 @@
129
115
 	dageo->fsblog = mp->m_sb.sb_blocklog;
130
116
 	dageo->blksize = xfs_dir2_dirblock_bytes(&mp->m_sb);
131
117
 	dageo->fsbcount = 1 << mp->m_sb.sb_dirblklog;
118
+	if (xfs_sb_version_hascrc(&mp->m_sb)) {
119
+		dageo->node_hdr_size = sizeof(struct xfs_da3_node_hdr);
120
+		dageo->leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr);
121
+		dageo->free_hdr_size = sizeof(struct xfs_dir3_free_hdr);
122
+		dageo->data_entry_offset =
123
+				sizeof(struct xfs_dir3_data_hdr);
124
+	} else {
125
+		dageo->node_hdr_size = sizeof(struct xfs_da_node_hdr);
126
+		dageo->leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr);
127
+		dageo->free_hdr_size = sizeof(struct xfs_dir2_free_hdr);
128
+		dageo->data_entry_offset =
129
+				sizeof(struct xfs_dir2_data_hdr);
130
+	}
131
+	dageo->leaf_max_ents = (dageo->blksize - dageo->leaf_hdr_size) /
132
+			sizeof(struct xfs_dir2_leaf_entry);
133
+	dageo->free_max_bests = (dageo->blksize - dageo->free_hdr_size) /
134
+			sizeof(xfs_dir2_data_off_t);
135
+
136
+	dageo->data_first_offset = dageo->data_entry_offset +
137
+			xfs_dir2_data_entsize(mp, 1) +
138
+			xfs_dir2_data_entsize(mp, 2);
132
139
 
133
140
 	/*
134
141
 	 * Now we've set up the block conversion variables, we can calculate the
..
..
@@ -137,7 +144,7 @@
137
144
 	dageo->datablk = xfs_dir2_byte_to_da(dageo, XFS_DIR2_DATA_OFFSET);
138
145
 	dageo->leafblk = xfs_dir2_byte_to_da(dageo, XFS_DIR2_LEAF_OFFSET);
139
146
 	dageo->freeblk = xfs_dir2_byte_to_da(dageo, XFS_DIR2_FREE_OFFSET);
140
-	dageo->node_ents = (dageo->blksize - nodehdr_size) /
147
+	dageo->node_ents = (dageo->blksize - dageo->node_hdr_size) /
141
148
 				(uint)sizeof(xfs_da_node_entry_t);
142
149
 	dageo->magicpct = (dageo->blksize * 37) / 100;
143
150
 
..
..
@@ -147,15 +154,10 @@
147
154
 	dageo->fsblog = mp->m_sb.sb_blocklog;
148
155
 	dageo->blksize = 1 << dageo->blklog;
149
156
 	dageo->fsbcount = 1;
150
-	dageo->node_ents = (dageo->blksize - nodehdr_size) /
157
+	dageo->node_hdr_size = mp->m_dir_geo->node_hdr_size;
158
+	dageo->node_ents = (dageo->blksize - dageo->node_hdr_size) /
151
159
 				(uint)sizeof(xfs_da_node_entry_t);
152
160
 	dageo->magicpct = (dageo->blksize * 37) / 100;
153
-
154
-	if (xfs_sb_version_hasasciici(&mp->m_sb))
155
-		mp->m_dirnameops = &xfs_ascii_ci_nameops;
156
-	else
157
-		mp->m_dirnameops = &xfs_default_nameops;
158
-
159
161
 	return 0;
160
162
 }
161
163
 
..
..
@@ -195,10 +197,10 @@
195
197
 {
196
198
 	bool		ino_ok = xfs_verify_dir_ino(mp, ino);
197
199
 
198
-	if (unlikely(XFS_TEST_ERROR(!ino_ok, mp, XFS_ERRTAG_DIR_INO_VALIDATE))) {
200
+	if (XFS_IS_CORRUPT(mp, !ino_ok) ||
201
+	    XFS_TEST_ERROR(false, mp, XFS_ERRTAG_DIR_INO_VALIDATE)) {
199
202
 		xfs_warn(mp, "Invalid inode number 0x%Lx",
200
203
 				(unsigned long long) ino);
201
-		XFS_ERROR_REPORT("xfs_dir_ino_validate", XFS_ERRLEVEL_LOW, mp);
202
204
 		return -EFSCORRUPTED;
203
205
 	}
204
206
 	return 0;
..
..
@@ -221,7 +223,7 @@
221
223
 	if (error)
222
224
 		return error;
223
225
 
224
-	args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);
226
+	args = kmem_zalloc(sizeof(*args), KM_NOFS);
225
227
 	if (!args)
226
228
 		return -ENOMEM;
227
229
 
..
..
@@ -258,7 +260,7 @@
258
260
 		XFS_STATS_INC(dp->i_mount, xs_dir_create);
259
261
 	}
260
262
 
261
-	args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);
263
+	args = kmem_zalloc(sizeof(*args), KM_NOFS);
262
264
 	if (!args)
263
265
 		return -ENOMEM;
264
266
 
..
..
@@ -266,7 +268,7 @@
266
268
 	args->name = name->name;
267
269
 	args->namelen = name->len;
268
270
 	args->filetype = name->type;
269
-	args->hashval = dp->i_mount->m_dirnameops->hashname(name);
271
+	args->hashval = xfs_dir2_hashname(dp->i_mount, name);
270
272
 	args->inumber = inum;
271
273
 	args->dp = dp;
272
274
 	args->total = total;
..
..
@@ -276,7 +278,7 @@
276
278
 	if (!inum)
277
279
 		args->op_flags |= XFS_DA_OP_JUSTCHECK;
278
280
 
279
-	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
281
+	if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
280
282
 		rval = xfs_dir2_sf_addname(args);
281
283
 		goto out_free;
282
284
 	}
..
..
@@ -357,12 +359,12 @@
357
359
 	 * lockdep Doing this avoids having to add a bunch of lockdep class
358
360
 	 * annotations into the reclaim path for the ilock.
359
361
 	 */
360
-	args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);
362
+	args = kmem_zalloc(sizeof(*args), KM_NOFS);
361
363
 	args->geo = dp->i_mount->m_dir_geo;
362
364
 	args->name = name->name;
363
365
 	args->namelen = name->len;
364
366
 	args->filetype = name->type;
365
-	args->hashval = dp->i_mount->m_dirnameops->hashname(name);
367
+	args->hashval = xfs_dir2_hashname(dp->i_mount, name);
366
368
 	args->dp = dp;
367
369
 	args->whichfork = XFS_DATA_FORK;
368
370
 	args->trans = tp;
..
..
@@ -371,7 +373,7 @@
371
373
 		args->op_flags |= XFS_DA_OP_CILOOKUP;
372
374
 
373
375
 	lock_mode = xfs_ilock_data_map_shared(dp);
374
-	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
376
+	if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
375
377
 		rval = xfs_dir2_sf_lookup(args);
376
378
 		goto out_check_rval;
377
379
 	}
..
..
@@ -426,7 +428,7 @@
426
428
 	ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
427
429
 	XFS_STATS_INC(dp->i_mount, xs_dir_remove);
428
430
 
429
-	args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);
431
+	args = kmem_zalloc(sizeof(*args), KM_NOFS);
430
432
 	if (!args)
431
433
 		return -ENOMEM;
432
434
 
..
..
@@ -434,14 +436,14 @@
434
436
 	args->name = name->name;
435
437
 	args->namelen = name->len;
436
438
 	args->filetype = name->type;
437
-	args->hashval = dp->i_mount->m_dirnameops->hashname(name);
439
+	args->hashval = xfs_dir2_hashname(dp->i_mount, name);
438
440
 	args->inumber = ino;
439
441
 	args->dp = dp;
440
442
 	args->total = total;
441
443
 	args->whichfork = XFS_DATA_FORK;
442
444
 	args->trans = tp;
443
445
 
444
-	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
446
+	if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
445
447
 		rval = xfs_dir2_sf_removename(args);
446
448
 		goto out_free;
447
449
 	}
..
..
@@ -487,7 +489,7 @@
487
489
 	if (rval)
488
490
 		return rval;
489
491
 
490
-	args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);
492
+	args = kmem_zalloc(sizeof(*args), KM_NOFS);
491
493
 	if (!args)
492
494
 		return -ENOMEM;
493
495
 
..
..
@@ -495,14 +497,14 @@
495
497
 	args->name = name->name;
496
498
 	args->namelen = name->len;
497
499
 	args->filetype = name->type;
498
-	args->hashval = dp->i_mount->m_dirnameops->hashname(name);
500
+	args->hashval = xfs_dir2_hashname(dp->i_mount, name);
499
501
 	args->inumber = inum;
500
502
 	args->dp = dp;
501
503
 	args->total = total;
502
504
 	args->whichfork = XFS_DATA_FORK;
503
505
 	args->trans = tp;
504
506
 
505
-	if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
507
+	if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
506
508
 		rval = xfs_dir2_sf_replace(args);
507
509
 		goto out_free;
508
510
 	}
..
..
@@ -604,7 +606,9 @@
604
606
 	if ((rval = xfs_bmap_last_offset(args->dp, &last, XFS_DATA_FORK)))
605
607
 		return rval;
606
608
 	rval = XFS_FSB_TO_B(args->dp->i_mount, last) == args->geo->blksize;
607
-	if (rval != 0 && args->dp->i_d.di_size != args->geo->blksize)
609
+	if (XFS_IS_CORRUPT(args->dp->i_mount,
610
+			   rval != 0 &&
611
+			   args->dp->i_d.di_size != args->geo->blksize))
608
612
 		return -EFSCORRUPTED;
609
613
 	*vp = rval;
610
614
 	return 0;
..
..
@@ -703,3 +707,41 @@
703
707
 	xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE);
704
708
 	return 0;
705
709
 }
710
+
711
+/* Returns true if the directory entry name is valid. */
712
+bool
713
+xfs_dir2_namecheck(
714
+	const void	*name,
715
+	size_t		length)
716
+{
717
+	/*
718
+	 * MAXNAMELEN includes the trailing null, but (name/length) leave it
719
+	 * out, so use >= for the length check.
720
+	 */
721
+	if (length >= MAXNAMELEN)
722
+		return false;
723
+
724
+	/* There shouldn't be any slashes or nulls here */
725
+	return !memchr(name, '/', length) && !memchr(name, 0, length);
726
+}
727
+
728
+xfs_dahash_t
729
+xfs_dir2_hashname(
730
+	struct xfs_mount	*mp,
731
+	struct xfs_name		*name)
732
+{
733
+	if (unlikely(xfs_sb_version_hasasciici(&mp->m_sb)))
734
+		return xfs_ascii_ci_hashname(name);
735
+	return xfs_da_hashname(name->name, name->len);
736
+}
737
+
738
+enum xfs_dacmp
739
+xfs_dir2_compname(
740
+	struct xfs_da_args	*args,
741
+	const unsigned char	*name,
742
+	int			len)
743
+{
744
+	if (unlikely(xfs_sb_version_hasasciici(&args->dp->i_mount->m_sb)))
745
+		return xfs_ascii_ci_compname(args, name, len);
746
+	return xfs_da_compname(args, name, len);
747
+}