Skip to contentSkip to conversation

btrfs: add btrfs_read_policy_to_enum helper and refactor read, policy store

DISCUSSION Colin King (gmail) 2 participants 4 messages Dec 19, 2024 Btrfs file system

lore
Share & tools
lore
#0 lore raw

Hi,

Static analysis on linux-next today has found a potential buffer overflow in fs/btrfs/sysfs.c in function btrfs_read_policy_to_enum()

The strcpy to string param has no length checks on str and hence if str is longer than param a buffer overflow on the stack occurs. This can potentially occur when a user writes a long string to the btrfs sysfs file read_policy via btrfs_read_policy_store()

int btrfs_read_policy_to_enum(const char *str, s64 *value)

{
        char param[32] = {'\0'};
        char *__maybe_unused value_str;
        int index;
        bool found = false;

        if (!str || strlen(str) == 0)
                return 0;

        strcpy(param, str);   /* issue here */

	....
}

Colin

#1 lore raw

Hi,

The changes have already been submitted and will be included in the
next re-roll.

https://patchwork.kernel.org/project/linux-btrfs/patch/9fcc9f01bdab846db231b427f98fbb3e9df7c7a5.1734370092.git.anand.jain@oracle.com/#26168805

Thanks,
Anand

Quoted 22 lines · Colin King (gmail)

Hi,

Static analysis on linux-next today has found a potential buffer overflow in fs/btrfs/sysfs.c in function btrfs_read_policy_to_enum()

The strcpy to string param has no length checks on str and hence if str is longer than param a buffer overflow on the stack occurs. This can potentially occur when a user writes a long string to the btrfs sysfs file read_policy via btrfs_read_policy_store()

int btrfs_read_policy_to_enum(const char *str, s64 *value) {
        char param[32] = {'\0'};
        char *__maybe_unused value_str;
        int index;
        bool found = false;

        if (!str || strlen(str) == 0)
                return 0;

        strcpy(param, str);   /* issue here */

    ....
}

Colin

#2 lore raw
Quoted 5 lines · Anand Jain

Hi,

 The changes have already been submitted and will be included in the
next re-roll.

Thanks for the update.

I noticed the fix was:

strncpy(param, str, 31);

perhaps that should be based on the sizeof param, e.g. sizeof(param) - 1 rather than a hard-coded 31 just in case the size of param is changed in the future.

Colin

Quoted 32 lines

 https://patchwork.kernel.org/project/linux-btrfs/
patch/9fcc9f01bdab846db231b427f98fbb3e9df7c7a5.1734370092.git.anand.jain@oracle.com/#26168805

Thanks,
Anand

Quoted 22 lines · Colin King (gmail)

Hi,

Static analysis on linux-next today has found a potential buffer overflow in fs/btrfs/sysfs.c in function btrfs_read_policy_to_enum()

The strcpy to string param has no length checks on str and hence if str is longer than param a buffer overflow on the stack occurs. This can potentially occur when a user writes a long string to the btrfs sysfs file read_policy via btrfs_read_policy_store()

int btrfs_read_policy_to_enum(const char *str, s64 *value) {
         char param[32] = {'\0'};
         char *__maybe_unused value_str;
         int index;
         bool found = false;

         if (!str || strlen(str) == 0)
                 return 0;

         strcpy(param, str);   /* issue here */

     ....
}

Colin

#3 lore raw
Quoted 6 lines · Colin King (gmail)
Quoted 4 lines · Anand Jain

Hi,

  The changes have already been submitted and will be included in the next re-roll.

Quoted 8 lines

Thanks for the update.

I noticed the fix was:

strncpy(param, str, 31);

perhaps that should be based on the sizeof param, e.g. sizeof(param) - 1 rather than a hard-coded 31 just in case the size of param is changed in the future.

Good point, I should have used sizeof(param) - 1.

Thx, Anand

Quoted 34 lines

Colin

Quoted 31 lines

  https://patchwork.kernel.org/project/linux-btrfs/ patch/9fcc9f01bdab846db231b427f98fbb3e9df7c7a5.1734370092.git.anand.jain@oracle.com/#26168805

Thanks,
Anand

Quoted 22 lines · Colin King (gmail)

Hi,

Static analysis on linux-next today has found a potential buffer overflow in fs/btrfs/sysfs.c in function btrfs_read_policy_to_enum()

The strcpy to string param has no length checks on str and hence if str is longer than param a buffer overflow on the stack occurs. This can potentially occur when a user writes a long string to the btrfs sysfs file read_policy via btrfs_read_policy_store()

int btrfs_read_policy_to_enum(const char *str, s64 *value) {
         char param[32] = {'\0'};
         char *__maybe_unused value_str;
         int index;
         bool found = false;

         if (!str || strlen(str) == 0)
                 return 0;

         strcpy(param, str);   /* issue here */

     ....
}

Colin