aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2006-03-23 10:03:11 -0500
committerAnton Altaparmakov <aia21@cantab.net>2006-03-23 10:03:11 -0500
commit3ccc7384db3d762e834dfdae13c1d6434b2fdeab (patch)
tree2bddfd2b0c5e1f2098c95d0c6bd611e33971591d
parent67b1dfe77a2eb2a88b37cd77b8979cbdb7695bd6 (diff)
NTFS: Fix a buggette in an "should be impossible" case handling where we
continued the attribute lookup loop instead of aborting it. Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
-rw-r--r--fs/ntfs/ChangeLog2
-rw-r--r--fs/ntfs/attrib.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 3d8d60be48de..d35a5c8e3da9 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -24,6 +24,8 @@ ToDo/Notes:
24 - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for 24 - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for
25 reporting them. 25 reporting them.
26 - Fix an (innocent) off-by-one error in the runlist code. 26 - Fix an (innocent) off-by-one error in the runlist code.
27 - Fix a buggette in an "should be impossible" case handling where we
28 continued the attribute lookup loop instead of aborting it.
27 29
282.1.26 - Minor bug fixes and updates. 302.1.26 - Minor bug fixes and updates.
29 31
diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 9480a0526cd3..a92b9e9db91d 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1,7 +1,7 @@
1/** 1/**
2 * attrib.c - NTFS attribute operations. Part of the Linux-NTFS project. 2 * attrib.c - NTFS attribute operations. Part of the Linux-NTFS project.
3 * 3 *
4 * Copyright (c) 2001-2005 Anton Altaparmakov 4 * Copyright (c) 2001-2006 Anton Altaparmakov
5 * Copyright (c) 2002 Richard Russon 5 * Copyright (c) 2002 Richard Russon
6 * 6 *
7 * This program/include file is free software; you can redistribute it and/or 7 * This program/include file is free software; you can redistribute it and/or
@@ -1048,7 +1048,7 @@ do_next_attr_loop:
1048 le32_to_cpu(ctx->mrec->bytes_allocated)) 1048 le32_to_cpu(ctx->mrec->bytes_allocated))
1049 break; 1049 break;
1050 if (a->type == AT_END) 1050 if (a->type == AT_END)
1051 continue; 1051 break;
1052 if (!a->length) 1052 if (!a->length)
1053 break; 1053 break;
1054 if (al_entry->instance != a->instance) 1054 if (al_entry->instance != a->instance)