Commit 379dde63 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Cyrill Gorcunov

sockets: Clean usk_img dereference

There's no need in img fd pointer in opening functions.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent 5c083e12
...@@ -716,7 +716,7 @@ err: ...@@ -716,7 +716,7 @@ err:
return -1; return -1;
} }
static int open_unix_sk_dgram(int sk, struct unix_sk_entry *ue, int *img_fd) static int open_unix_sk_dgram(int sk, struct unix_sk_entry *ue, int img_fd)
{ {
if (ue->namelen) { if (ue->namelen) {
...@@ -732,7 +732,7 @@ static int open_unix_sk_dgram(int sk, struct unix_sk_entry *ue, int *img_fd) ...@@ -732,7 +732,7 @@ static int open_unix_sk_dgram(int sk, struct unix_sk_entry *ue, int *img_fd)
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
ret = read(*img_fd, &addr.sun_path, ue->namelen); ret = read(img_fd, &addr.sun_path, ue->namelen);
if (ret != ue->namelen) { if (ret != ue->namelen) {
pr_err("Error reading socket name from image (%d)", ret); pr_err("Error reading socket name from image (%d)", ret);
goto err; goto err;
...@@ -786,7 +786,7 @@ err: ...@@ -786,7 +786,7 @@ err:
return -1; return -1;
} }
static int open_unix_sk_stream(int sk, struct unix_sk_entry *ue, int *img_fd) static int open_unix_sk_stream(int sk, struct unix_sk_entry *ue, int img_fd)
{ {
int ret = -1; int ret = -1;
...@@ -806,7 +806,7 @@ static int open_unix_sk_stream(int sk, struct unix_sk_entry *ue, int *img_fd) ...@@ -806,7 +806,7 @@ static int open_unix_sk_stream(int sk, struct unix_sk_entry *ue, int *img_fd)
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
ret = read(*img_fd, &addr.sun_path, ue->namelen); ret = read(img_fd, &addr.sun_path, ue->namelen);
if (ret != ue->namelen) { if (ret != ue->namelen) {
pr_err("Error reading socket name from image (%d)", ret); pr_err("Error reading socket name from image (%d)", ret);
goto err; goto err;
...@@ -904,11 +904,11 @@ static int open_unix_sk(struct unix_sk_entry *ue, int *img_fd) ...@@ -904,11 +904,11 @@ static int open_unix_sk(struct unix_sk_entry *ue, int *img_fd)
switch (ue->type) { switch (ue->type) {
case SOCK_STREAM: case SOCK_STREAM:
if (open_unix_sk_stream(sk, ue, img_fd)) if (open_unix_sk_stream(sk, ue, *img_fd))
goto err; goto err;
break; break;
case SOCK_DGRAM: case SOCK_DGRAM:
if (open_unix_sk_dgram(sk, ue, img_fd)) if (open_unix_sk_dgram(sk, ue, *img_fd))
goto err; goto err;
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment