diff mbox series

[27/41] fs/adfs: newdir: improve directory validation

Message ID	E1ieGvw-0004cn-6M@rmk-PC.armlinux.org.uk (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=vczE=Z7=vger.kernel.org=linux-fsdevel-owner@kernel.org> In-Reply-To: <20191209110731.GD25745@shell.armlinux.org.uk> References: <20191209110731.GD25745@shell.armlinux.org.uk> From: Russell King <rmk+kernel@armlinux.org.uk> To: Al Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH 27/41] fs/adfs: newdir: improve directory validation MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <E1ieGvw-0004cn-6M@rmk-PC.armlinux.org.uk> Date: Mon, 09 Dec 2019 11:10:32 +0000 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk
Series	fs/adfs updates for 5.6 \| expand [00/41] fs/adfs updates for 5.6 [01/41] fs/adfs: inode: update timestamps to centisecond precision [02/41] fs/adfs: inode: fix adfs_mode2atts() [03/41] fs/adfs: map: move map reading and validation to map.c [04/41] fs/adfs: map: rename adfs_map_free() to adfs_map_statfs() [05/41] fs/adfs: map: break up adfs_read_map() [06/41] fs/adfs: map: factor out map cleanup [07/41] fs/adfs: map: incorporate map offsets into layout [08/41] fs/adfs: map: use find_next_bit_le() rather than open coding it [09/41] fs/adfs: map: move map-specific sb initialisation to map.c [10/41] fs/adfs: map: fix map scanning [11/41] fs/adfs: dir: rename bh_fplus to bhs [12/41] fs/adfs: dir: add common dir object initialisation [13/41] fs/adfs: dir: add common directory buffer release method [14/41] fs/adfs: dir: add common directory sync method [15/41] fs/adfs: dir: add generic copy functions [16/41] fs/adfs: dir: add generic directory reading [17/41] fs/adfs: dir: add helper to read directory using inode [18/41] fs/adfs: dir: add helper to mark directory buffers dirty [19/41] fs/adfs: dir: update directory locking [20/41] fs/adfs: dir: modernise on-disk directory structures [21/41] fs/adfs: dir: improve update failure handling [22/41] fs/adfs: dir: improve compiler coverage in adfs_dir_update [23/41] fs/adfs: dir: switch to iterate_shared method [24/41] fs/adfs: dir: add more efficient iterate() per-format method [25/41] fs/adfs: dir: use pointers to access directory head/tails [26/41] fs/adfs: newdir: factor out directory format validation [27/41] fs/adfs: newdir: improve directory validation [28/41] fs/adfs: newdir: merge adfs_dir_read() into adfs_f_read() [29/41] fs/adfs: newdir: clean up adfs_f_update() [30/41] fs/adfs: newdir: split out directory commit from update [31/41] fs/adfs: bigdir: factor out directory entry offset calculation [32/41] fs/adfs: bigdir: extract directory validation [33/41] fs/adfs: bigdir: directory validation strengthening [34/41] fs/adfs: bigdir: calculate and validate directory checkbyte [35/41] fs/adfs: bigdir: implement directory update support [36/41] fs/adfs: super: fix inode dropping [37/41] fs/adfs: dir: remove debug in adfs_dir_update() [38/41] fs/adfs: super: extract filesystem block probe [39/41] fs/adfs: super: add support for E and E+ floppy image formats [40/41] fs/adfs: mostly divorse inode number from indirect disc address [41/41] Documentation: update adfs filesystem documentation

Commit Message

Russell King (Oracle) Dec. 9, 2019, 11:10 a.m. UTC

Check that the lastmask and reserved fields are all zero, as per the
documentation.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 fs/adfs/dir_f.c | 1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

diff --git a/fs/adfs/dir_f.c b/fs/adfs/dir_f.c
index 196706d581bf..ebe8616ee533 100644
--- a/fs/adfs/dir_f.c
+++ b/fs/adfs/dir_f.c
@@ -127,6 +127,7 @@  static int adfs_f_validate(struct adfs_dir *dir)
 	struct adfs_newdirtail *tail = dir->newtail;
 
 	if (head->startmasseq != tail->endmasseq ||
+	    tail->dirlastmask || tail->reserved[0] || tail->reserved[1] ||
 	    (memcmp(&head->startname, "Nick", 4) &&
 	     memcmp(&head->startname, "Hugo", 4)) ||
 	    memcmp(&head->startname, &tail->endname, 4) ||