diff options
| author | Linus Torvalds <[email protected]> | 2023-03-04 13:32:50 -0800 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-03-04 13:32:50 -0800 | 
| commit | 20fdfd55ab5c3fdff5b43de632a8d8fb7744e186 (patch) | |
| tree | 6481362867060f1085deff4cd8e8a9055066c9b7 /lib/parser.c | |
| parent | c29214bc89169f735657f614bde7c0fad74bd1b5 (diff) | |
| parent | ecf1d926661bec4080a79c0ac9dbfe02b31702cf (diff) | |
Merge tag 'mm-hotfixes-stable-2023-03-04-13-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc fixes from Andrew Morton:
 "17 hotfixes.
  Eight are for MM and seven are for other parts of the kernel. Seven
  are cc:stable and eight address post-6.3 issues or were judged
  unsuitable for -stable backporting"
* tag 'mm-hotfixes-stable-2023-03-04-13-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mailmap: map Dikshita Agarwal's old address to his current one
  mailmap: map Vikash Garodia's old address to his current one
  fs/cramfs/inode.c: initialize file_ra_state
  fs: hfsplus: fix UAF issue in hfsplus_put_super
  panic: fix the panic_print NMI backtrace setting
  lib: parser: update documentation for match_NUMBER functions
  kasan, x86: don't rename memintrinsics in uninstrumented files
  kasan: test: fix test for new meminstrinsic instrumentation
  kasan: treat meminstrinsic as builtins in uninstrumented files
  kasan: emit different calls for instrumentable memintrinsics
  ocfs2: fix non-auto defrag path not working issue
  ocfs2: fix defrag path triggering jbd2 ASSERT
  mailmap: map Georgi Djakov's old Linaro address to his current one
  mm/hwpoison: convert TTU_IGNORE_HWPOISON to TTU_HWPOISON
  lib/zlib: DFLTCC deflate does not write all available bits for Z_NO_FLUSH
  mm/damon/paddr: fix missing folio_put()
  mm/mremap: fix dup_anon_vma() in vma_merge() case 4
Diffstat (limited to 'lib/parser.c')
| -rw-r--r-- | lib/parser.c | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/lib/parser.c b/lib/parser.c index 2b5e2b480253..f4eafb9d74e6 100644 --- a/lib/parser.c +++ b/lib/parser.c @@ -133,7 +133,7 @@ EXPORT_SYMBOL(match_token);   * as a number in that base.   *   * Return: On success, sets @result to the integer represented by the - * string and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + * string and returns 0. Returns -EINVAL or -ERANGE on failure.   */  static int match_number(substring_t *s, int *result, int base)  { @@ -165,7 +165,7 @@ static int match_number(substring_t *s, int *result, int base)   * as a number in that base.   *   * Return: On success, sets @result to the integer represented by the - * string and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + * string and returns 0. Returns -EINVAL or -ERANGE on failure.   */  static int match_u64int(substring_t *s, u64 *result, int base)  { @@ -189,7 +189,7 @@ static int match_u64int(substring_t *s, u64 *result, int base)   * Description: Attempts to parse the &substring_t @s as a decimal integer.   *   * Return: On success, sets @result to the integer represented by the string - * and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + * and returns 0. Returns -EINVAL or -ERANGE on failure.   */  int match_int(substring_t *s, int *result)  { @@ -205,7 +205,7 @@ EXPORT_SYMBOL(match_int);   * Description: Attempts to parse the &substring_t @s as a decimal integer.   *   * Return: On success, sets @result to the integer represented by the string - * and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + * and returns 0. Returns -EINVAL or -ERANGE on failure.   */  int match_uint(substring_t *s, unsigned int *result)  { @@ -228,7 +228,7 @@ EXPORT_SYMBOL(match_uint);   * integer.   *   * Return: On success, sets @result to the integer represented by the string - * and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + * and returns 0. Returns -EINVAL or -ERANGE on failure.   */  int match_u64(substring_t *s, u64 *result)  { @@ -244,7 +244,7 @@ EXPORT_SYMBOL(match_u64);   * Description: Attempts to parse the &substring_t @s as an octal integer.   *   * Return: On success, sets @result to the integer represented by the string - * and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + * and returns 0. Returns -EINVAL or -ERANGE on failure.   */  int match_octal(substring_t *s, int *result)  { @@ -260,7 +260,7 @@ EXPORT_SYMBOL(match_octal);   * Description: Attempts to parse the &substring_t @s as a hexadecimal integer.   *   * Return: On success, sets @result to the integer represented by the string - * and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure. + * and returns 0. Returns -EINVAL or -ERANGE on failure.   */  int match_hex(substring_t *s, int *result)  { |