Skip to content

Commit f0b6a83

Browse files
Paulo Alcantarasmfrench
authored andcommitted
smb: client: fix warning in generic_ip_connect()
This fixes the following warning reported by kernel test robot fs/smb/client/connect.c:2974 generic_ip_connect() error: we previously assumed 'socket' could be null (see line 2962) Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Paulo Alcantara (SUSE) <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 215533f commit f0b6a83

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

fs/smb/client/connect.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,11 +2934,11 @@ ip_rfc1001_connect(struct TCP_Server_Info *server)
29342934
static int
29352935
generic_ip_connect(struct TCP_Server_Info *server)
29362936
{
2937-
int rc = 0;
2938-
__be16 sport;
2939-
int slen, sfamily;
2940-
struct socket *socket = server->ssocket;
29412937
struct sockaddr *saddr;
2938+
struct socket *socket;
2939+
int slen, sfamily;
2940+
__be16 sport;
2941+
int rc = 0;
29422942

29432943
saddr = (struct sockaddr *) &server->dstaddr;
29442944

@@ -2960,18 +2960,19 @@ generic_ip_connect(struct TCP_Server_Info *server)
29602960
ntohs(sport));
29612961
}
29622962

2963-
if (socket == NULL) {
2963+
if (server->ssocket) {
2964+
socket = server->ssocket;
2965+
} else {
29642966
rc = __sock_create(cifs_net_ns(server), sfamily, SOCK_STREAM,
2965-
IPPROTO_TCP, &socket, 1);
2967+
IPPROTO_TCP, &server->ssocket, 1);
29662968
if (rc < 0) {
29672969
cifs_server_dbg(VFS, "Error %d creating socket\n", rc);
2968-
server->ssocket = NULL;
29692970
return rc;
29702971
}
29712972

29722973
/* BB other socket options to set KEEPALIVE, NODELAY? */
29732974
cifs_dbg(FYI, "Socket created\n");
2974-
server->ssocket = socket;
2975+
socket = server->ssocket;
29752976
socket->sk->sk_allocation = GFP_NOFS;
29762977
socket->sk->sk_use_task_frag = false;
29772978
if (sfamily == AF_INET6)

0 commit comments

Comments
 (0)