diff options
| author | Willy Tarreau <w@1wt.eu> | 2014-12-06 15:14:58 +0100 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-12-15 15:00:56 +0100 |
| commit | 3c7952168cdc9cd2f7962c943537312d02d43d5c (patch) | |
| tree | 1a0f8b96dae50f7fea254da86cd4204a06654495 | |
| parent | 6f745f36cd5e1d8ce2a8681935c9a4f7193b13f1 (diff) | |
| download | linux-2.6.32.y-drm33.z-3c7952168cdc9cd2f7962c943537312d02d43d5c.tar.gz | |
net: sendmsg: fix failed backport of "fix NULL pointer dereference"
Luis Henriques reported that while backporting commit 40eea80 ("net:
sendmsg: fix NULL pointer dereference") and applying the diff by hand,
I made a typo resulting in the same test being done twice, and msg_name
not being tested.
This fixes cf90357 ("net: sendmsg: fix NULL pointer dereference")
which was merged into 2.6.32.64.
Cc: Andrey Ryabinin <a.ryabinin@samsung.com>
Cc: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -rw-r--r-- | net/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/compat.c b/net/compat.c index 71ed8393d884b..a5848acc1738d 100644 --- a/net/compat.c +++ b/net/compat.c @@ -83,7 +83,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, { int tot_len; - if (kern_msg->msg_namelen && kern_msg->msg_namelen) { + if (kern_msg->msg_name && kern_msg->msg_namelen) { if (mode==VERIFY_READ) { int err = move_addr_to_kernel(kern_msg->msg_name, kern_msg->msg_namelen, |