forked from openzfs/zfs
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Linux 6.8 compat: implement strlcpy fallback
Linux has removed strlcpy in favour of strscpy. This implements a fallback implementation of strlcpy for this case. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rob Norris <[email protected]> Sponsored-by: https://despairlabs.com/sponsor/ Closes openzfs#15805
- Loading branch information
Showing
7 changed files
with
104 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
dnl # | ||
dnl # 6.8.x replaced strlcpy with strscpy. Check for both so we can provide | ||
dnl # appropriate fallbacks. | ||
dnl # | ||
AC_DEFUN([ZFS_AC_KERNEL_SRC_STRLCPY], [ | ||
ZFS_LINUX_TEST_SRC([kernel_has_strlcpy], [ | ||
#include <linux/string.h> | ||
], [ | ||
const char *src = "goodbye"; | ||
char dst[32]; | ||
size_t len; | ||
len = strlcpy(dst, src, sizeof (dst)); | ||
]) | ||
]) | ||
|
||
AC_DEFUN([ZFS_AC_KERNEL_SRC_STRSCPY], [ | ||
ZFS_LINUX_TEST_SRC([kernel_has_strscpy], [ | ||
#include <linux/string.h> | ||
], [ | ||
const char *src = "goodbye"; | ||
char dst[32]; | ||
ssize_t len; | ||
len = strscpy(dst, src, sizeof (dst)); | ||
]) | ||
]) | ||
|
||
AC_DEFUN([ZFS_AC_KERNEL_STRLCPY], [ | ||
AC_MSG_CHECKING([whether strlcpy() exists]) | ||
ZFS_LINUX_TEST_RESULT([kernel_has_strlcpy], [ | ||
AC_MSG_RESULT([yes]) | ||
AC_DEFINE(HAVE_KERNEL_STRLCPY, 1, | ||
[strlcpy() exists]) | ||
], [ | ||
AC_MSG_RESULT([no]) | ||
]) | ||
]) | ||
|
||
AC_DEFUN([ZFS_AC_KERNEL_STRSCPY], [ | ||
AC_MSG_CHECKING([whether strscpy() exists]) | ||
ZFS_LINUX_TEST_RESULT([kernel_has_strscpy], [ | ||
AC_MSG_RESULT([yes]) | ||
AC_DEFINE(HAVE_KERNEL_STRSCPY, 1, | ||
[strscpy() exists]) | ||
], [ | ||
AC_MSG_RESULT([no]) | ||
]) | ||
]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,50 @@ | ||
/* | ||
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. | ||
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). | ||
* Written by Brian Behlendorf <[email protected]>. | ||
* UCRL-CODE-235197 | ||
* | ||
* This file is part of the SPL, Solaris Porting Layer. | ||
* | ||
* The SPL is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License as published by the | ||
* Free Software Foundation; either version 2 of the License, or (at your | ||
* option) any later version. | ||
* | ||
* The SPL is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along | ||
* with the SPL. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#ifndef _SPL_STRING_H | ||
#define _SPL_STRING_H | ||
|
||
#include <linux/string.h> | ||
|
||
/* Fallbacks for kernel missing strlcpy */ | ||
#ifndef HAVE_KERNEL_STRLCPY | ||
|
||
#if defined(HAVE_KERNEL_STRSCPY) | ||
/* | ||
* strscpy is strlcpy, but returns an error on truncation. strlcpy is defined | ||
* to return strlen(src), so detect error and override it. | ||
*/ | ||
static inline size_t | ||
strlcpy(char *dest, const char *src, size_t size) | ||
{ | ||
ssize_t ret = strscpy(dest, src, size); | ||
if (likely(ret > 0)) | ||
return ((size_t)ret); | ||
return (strlen(src)); | ||
} | ||
#else | ||
#error "no strlcpy fallback available" | ||
#endif | ||
|
||
#endif /* HAVE_KERNEL_STRLCPY */ | ||
|
||
#endif /* _SPL_STRING_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters