* [PATCH v2] ocfs2: replace deprecated simple_strtol with kstrtol
@ 2024-11-15 8:00 Daniel Yang
2024-11-17 12:30 ` Joseph Qi
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Yang @ 2024-11-15 8:00 UTC (permalink / raw)
To: Mark Fasheh, Joel Becker, Joseph Qi, GitAuthor: Daniel Yang,
open list:ORACLE CLUSTER FILESYSTEM 2 (OCFS2),
open list
The function simple_strtol ignores overflows and has an awkward
interface for error checking. Replace with the recommended kstrtol
function leads to clearer error checking and safer conversions.
Signed-off-by: Daniel Yang <danielyangkang@gmail.com>
---
v1->v2: reuse ret and remove blank line
fs/ocfs2/cluster/heartbeat.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 4b9f45d70..18333aa19 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -3,6 +3,7 @@
* Copyright (C) 2004, 2005 Oracle. All rights reserved.
*/
+#include "linux/kstrtox.h"
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/jiffies.h>
@@ -1777,8 +1778,8 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,
if (o2nm_this_node() == O2NM_MAX_NODES)
goto out;
- fd = simple_strtol(p, &p, 0);
- if (!p || (*p && (*p != '\n')))
+ ret = kstrtol(p, 0, &fd);
+ if (ret < 0)
goto out;
if (fd < 0 || fd >= INT_MAX)
--
2.39.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] ocfs2: replace deprecated simple_strtol with kstrtol
2024-11-15 8:00 [PATCH v2] ocfs2: replace deprecated simple_strtol with kstrtol Daniel Yang
@ 2024-11-17 12:30 ` Joseph Qi
0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi @ 2024-11-17 12:30 UTC (permalink / raw)
To: Daniel Yang, akpm
Cc: open list:ORACLE CLUSTER FILESYSTEM 2 (OCFS2),
open list, Mark Fasheh, Joel Becker
On 11/15/24 4:00 PM, Daniel Yang wrote:
> The function simple_strtol ignores overflows and has an awkward
> interface for error checking. Replace with the recommended kstrtol
> function leads to clearer error checking and safer conversions.
>
> Signed-off-by: Daniel Yang <danielyangkang@gmail.com>
Looks good.
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
> v1->v2: reuse ret and remove blank line
>
> fs/ocfs2/cluster/heartbeat.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
> index 4b9f45d70..18333aa19 100644
> --- a/fs/ocfs2/cluster/heartbeat.c
> +++ b/fs/ocfs2/cluster/heartbeat.c
> @@ -3,6 +3,7 @@
> * Copyright (C) 2004, 2005 Oracle. All rights reserved.
> */
>
> +#include "linux/kstrtox.h"
> #include <linux/kernel.h>
> #include <linux/sched.h>
> #include <linux/jiffies.h>
> @@ -1777,8 +1778,8 @@ static ssize_t o2hb_region_dev_store(struct config_item *item,
> if (o2nm_this_node() == O2NM_MAX_NODES)
> goto out;
>
> - fd = simple_strtol(p, &p, 0);
> - if (!p || (*p && (*p != '\n')))
> + ret = kstrtol(p, 0, &fd);
> + if (ret < 0)
> goto out;
>
> if (fd < 0 || fd >= INT_MAX)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-17 12:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-15 8:00 [PATCH v2] ocfs2: replace deprecated simple_strtol with kstrtol Daniel Yang
2024-11-17 12:30 ` Joseph Qi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®