Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 67b1dfe77a2eb2a88b37cd77b8979cbdb7695bd6

Authored by Anton Altaparmakov
1 parent b4d8d1a93c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

NTFS: Fix an (innocent) off-by-one error in the runlist code. 

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Showing 5 changed files with 17 additions and 7 deletions Side-by-side Diff

... ... @@ -19,6 +19,12 @@
19 19 - Enable the code for setting the NT4 compatibility flag when we start
20 20 making NTFS 1.2 specific modifications.
21 21  
  22 +2.1.27 - Various bug fixes.
  23 +
  24 + - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for
  25 + reporting them.
  26 + - Fix an (innocent) off-by-one error in the runlist code.
  27 +
22 28 2.1.26 - Minor bug fixes and updates.
23 29  
24 30 - Fix a potential overflow in file.c where a cast to s64 was missing in
... ... @@ -6,7 +6,7 @@
6 6 index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
7 7 unistr.o upcase.o
8 8  
9   -EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.26\"
  9 +EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.27\"
10 10  
11 11 ifeq ($(CONFIG_NTFS_DEBUG),y)
12 12 EXTRA_CFLAGS += -DDEBUG
... ... @@ -2,7 +2,7 @@
2 2 * namei.c - NTFS kernel directory inode operations. Part of the Linux-NTFS
3 3 * project.
4 4 *
5   - * Copyright (c) 2001-2004 Anton Altaparmakov
  5 + * Copyright (c) 2001-2006 Anton Altaparmakov
6 6 *
7 7 * This program/include file is free software; you can redistribute it and/or
8 8 * modify it under the terms of the GNU General Public License as published
... ... @@ -381,6 +381,7 @@
381 381 static inline runlist_element *ntfs_rl_replace(runlist_element *dst,
382 382 int dsize, runlist_element *src, int ssize, int loc)
383 383 {
  384 + signed delta;
384 385 BOOL left = FALSE; /* Left end of @src needs merging. */
385 386 BOOL right = FALSE; /* Right end of @src needs merging. */
386 387 int tail; /* Start of tail of @dst. */
387 388  
... ... @@ -396,11 +397,14 @@
396 397 left = ntfs_are_rl_mergeable(dst + loc - 1, src);
397 398 /*
398 399 * Allocate some space. We will need less if the left, right, or both
399   - * ends get merged.
  400 + * ends get merged. The -1 accounts for the run being replaced.
400 401 */
401   - dst = ntfs_rl_realloc(dst, dsize, dsize + ssize - left - right);
402   - if (IS_ERR(dst))
403   - return dst;
  402 + delta = ssize - 1 - left - right;
  403 + if (delta > 0) {
  404 + dst = ntfs_rl_realloc(dst, dsize, dsize + delta);
  405 + if (IS_ERR(dst))
  406 + return dst;
  407 + }
404 408 /*
405 409 * We are guaranteed to succeed from here so can start modifying the
406 410 * original runlists.
... ... @@ -3234,7 +3234,7 @@
3234 3234 }
3235 3235  
3236 3236 MODULE_AUTHOR("Anton Altaparmakov <aia21@cantab.net>");
3237   -MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2005 Anton Altaparmakov");
  3237 +MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2006 Anton Altaparmakov");
3238 3238 MODULE_VERSION(NTFS_VERSION);
3239 3239 MODULE_LICENSE("GPL");
3240 3240 #ifdef DEBUG