summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2016-05-22 12:49:08 +0000
committerdchagin <dchagin@FreeBSD.org>2016-05-22 12:49:08 +0000
commit97c779b69f971ffb4a3467e8b91db614297bc832 (patch)
treeeb9545ff1c1621d29ed7539978a405bd492bc28b
parent791b4b11220da33b615f8f806a4061700e6564dd (diff)
downloadFreeBSD-src-97c779b69f971ffb4a3467e8b91db614297bc832.zip
FreeBSD-src-97c779b69f971ffb4a3467e8b91db614297bc832.tar.gz
Add a missing errno translation for SO_ERROR optname.
PR: 135458 Reported by: Stefan Schmidt @ stadtbuch.de MFC after: 1 week
-rw-r--r--sys/compat/linux/linux_socket.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 105aec5..bca5d39 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -1608,10 +1608,10 @@ linux_getsockopt(struct thread *td, struct linux_getsockopt_args *args)
} */ bsd_args;
l_timeval linux_tv;
struct timeval tv;
- socklen_t tv_len, xulen;
+ socklen_t tv_len, xulen, len;
struct xucred xu;
struct l_ucred lxu;
- int error, name;
+ int error, name, newval;
bsd_args.s = args->s;
bsd_args.level = linux_to_bsd_sockopt_level(args->level);
@@ -1650,6 +1650,15 @@ linux_getsockopt(struct thread *td, struct linux_getsockopt_args *args)
return (copyout(&lxu, PTRIN(args->optval), sizeof(lxu)));
/* NOTREACHED */
break;
+ case SO_ERROR:
+ len = sizeof(newval);
+ error = kern_getsockopt(td, args->s, bsd_args.level,
+ name, &newval, UIO_SYSSPACE, &len);
+ if (error)
+ return (error);
+ newval = -SV_ABI_ERRNO(td->td_proc, newval);
+ return (copyout(&newval, PTRIN(args->optval), len));
+ /* NOTREACHED */
default:
break;
}
OpenPOWER on IntegriCloud