diff mbox series

net: tipc: fix possible refcount leak in tipc_sk_create()

Message ID 20220629022402.10841-1-hbh25y@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series net: tipc: fix possible refcount leak in tipc_sk_create() | expand

Checks

Context Check Description
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers success CCed 10 of 10 maintainers
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 7 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Hangyu Hua June 29, 2022, 2:24 a.m. UTC
sk need to be free when tipc_sk_insert fails. While tipc_sk_insert is hard
to fail, it's better to fix this.

Fixes: 07f6c4bc048a ("tipc: convert tipc reference table to use generic rhashtable")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
---
 net/tipc/socket.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Tung Quang Nguyen June 29, 2022, 3:49 a.m. UTC | #1
> sk need to be free when tipc_sk_insert fails. While tipc_sk_insert is hard
> to fail, it's better to fix this.
Incorrect English grammar. You should use a simple comment in changelog, for example: "Free sk in case tipc_sk_insert() fails."
> 
> Fixes: 07f6c4bc048a ("tipc: convert tipc reference table to use generic rhashtable")
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
> ---
>  net/tipc/socket.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> index 17f8c523e33b..43509c7e90fc 100644
> --- a/net/tipc/socket.c
> +++ b/net/tipc/socket.c
> @@ -502,6 +502,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
>  	sock_init_data(sock, sk);
>  	tipc_set_sk_state(sk, TIPC_OPEN);
>  	if (tipc_sk_insert(tsk)) {
> +		sk_free(sk);
>  		pr_warn("Socket create failed; port number exhausted\n");
>  		return -EINVAL;
>  	}
> --
> 2.25.1
Hangyu Hua June 29, 2022, 6:09 a.m. UTC | #2
On 2022/6/29 11:49, Tung Quang Nguyen wrote:
>> sk need to be free when tipc_sk_insert fails. While tipc_sk_insert is hard
>> to fail, it's better to fix this.
> Incorrect English grammar. You should use a simple comment in changelog, for example: "Free sk in case tipc_sk_insert() fails."

Thanks a lot. I will fix this then send a v2.

Hangyu.

>>
>> Fixes: 07f6c4bc048a ("tipc: convert tipc reference table to use generic rhashtable")
>> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
>> ---
>>   net/tipc/socket.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/net/tipc/socket.c b/net/tipc/socket.c
>> index 17f8c523e33b..43509c7e90fc 100644
>> --- a/net/tipc/socket.c
>> +++ b/net/tipc/socket.c
>> @@ -502,6 +502,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
>>   	sock_init_data(sock, sk);
>>   	tipc_set_sk_state(sk, TIPC_OPEN);
>>   	if (tipc_sk_insert(tsk)) {
>> +		sk_free(sk);
>>   		pr_warn("Socket create failed; port number exhausted\n");
>>   		return -EINVAL;
>>   	}
>> --
>> 2.25.1
>
diff mbox series

Patch

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 17f8c523e33b..43509c7e90fc 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -502,6 +502,7 @@  static int tipc_sk_create(struct net *net, struct socket *sock,
 	sock_init_data(sock, sk);
 	tipc_set_sk_state(sk, TIPC_OPEN);
 	if (tipc_sk_insert(tsk)) {
+		sk_free(sk);
 		pr_warn("Socket create failed; port number exhausted\n");
 		return -EINVAL;
 	}