* [PATCH] fs:cifs: convert from atomic_t to refcount_t on tlink->tl_count
@ 2021-11-12 9:30 cgel.zte
2021-11-15 5:13 ` Steve French
0 siblings, 1 reply; 2+ messages in thread
From: cgel.zte @ 2021-11-12 9:30 UTC (permalink / raw)
To: sfrench; +Cc: linux-cifs, samba-technical, linux-kernel, chiminghao, Zeal Robot
From: chiminghao <chi.minghao@zte.com.cn>
use refcount_t instead of atomic_t
which prevents reference counter overflows.
Reported-by: Zeal Robot <zealci@zte.com.cm>
Signed-off-by: chiminghao <chi.minghao@zte.com.cn>
---
fs/cifs/cifsglob.h | 4 ++--
fs/cifs/connect.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 41e97df4e0e5..a8edaada0fea 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -8,7 +8,7 @@
*/
#ifndef _CIFS_GLOB_H
#define _CIFS_GLOB_H
-
+#include <linux/refcount.h>
#include <linux/in.h>
#include <linux/in6.h>
#include <linux/inet.h>
@@ -1115,7 +1115,7 @@ struct tcon_link {
#define TCON_LINK_PENDING 1
#define TCON_LINK_IN_TREE 2
unsigned long tl_time;
- atomic_t tl_count;
+ refcount_t tl_count;
struct cifs_tcon *tl_tcon;
};
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 9637465d23db..4aad8c9acf2e 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2318,7 +2318,7 @@ cifs_put_tlink(struct tcon_link *tlink)
if (!tlink || IS_ERR(tlink))
return;
- if (!atomic_dec_and_test(&tlink->tl_count) ||
+ if (!refcount_dec_and_test(&tlink->tl_count) ||
test_bit(TCON_LINK_IN_TREE, &tlink->tl_flags)) {
tlink->tl_time = jiffies;
return;
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fs:cifs: convert from atomic_t to refcount_t on tlink->tl_count
2021-11-12 9:30 [PATCH] fs:cifs: convert from atomic_t to refcount_t on tlink->tl_count cgel.zte
@ 2021-11-15 5:13 ` Steve French
0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2021-11-15 5:13 UTC (permalink / raw)
To: cgel.zte
Cc: Steve French, CIFS, samba-technical, LKML, chiminghao, Zeal Robot
merged into cifs-2.6.git for-next pending testing
On Fri, Nov 12, 2021 at 3:32 AM <cgel.zte@gmail.com> wrote:
>
> From: chiminghao <chi.minghao@zte.com.cn>
>
> use refcount_t instead of atomic_t
> which prevents reference counter overflows.
>
> Reported-by: Zeal Robot <zealci@zte.com.cm>
> Signed-off-by: chiminghao <chi.minghao@zte.com.cn>
> ---
> fs/cifs/cifsglob.h | 4 ++--
> fs/cifs/connect.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
> index 41e97df4e0e5..a8edaada0fea 100644
> --- a/fs/cifs/cifsglob.h
> +++ b/fs/cifs/cifsglob.h
> @@ -8,7 +8,7 @@
> */
> #ifndef _CIFS_GLOB_H
> #define _CIFS_GLOB_H
> -
> +#include <linux/refcount.h>
> #include <linux/in.h>
> #include <linux/in6.h>
> #include <linux/inet.h>
> @@ -1115,7 +1115,7 @@ struct tcon_link {
> #define TCON_LINK_PENDING 1
> #define TCON_LINK_IN_TREE 2
> unsigned long tl_time;
> - atomic_t tl_count;
> + refcount_t tl_count;
> struct cifs_tcon *tl_tcon;
> };
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 9637465d23db..4aad8c9acf2e 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -2318,7 +2318,7 @@ cifs_put_tlink(struct tcon_link *tlink)
> if (!tlink || IS_ERR(tlink))
> return;
>
> - if (!atomic_dec_and_test(&tlink->tl_count) ||
> + if (!refcount_dec_and_test(&tlink->tl_count) ||
> test_bit(TCON_LINK_IN_TREE, &tlink->tl_flags)) {
> tlink->tl_time = jiffies;
> return;
> --
> 2.25.1
>
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-15 5:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-12 9:30 [PATCH] fs:cifs: convert from atomic_t to refcount_t on tlink->tl_count cgel.zte
2021-11-15 5:13 ` Steve French
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).