Page MenuHomeFreeBSD
Files F132948507

D25461.id73959.diff
No OneTemporary
Actions

D25461.id73959.diff
View Options

Index: head/sys/compat/linux/linux_socket.c
===================================================================
--- head/sys/compat/linux/linux_socket.c
+++ head/sys/compat/linux/linux_socket.c
@@ -40,6 +40,7 @@
#include <sys/capsicum.h>
#include <sys/fcntl.h>
#include <sys/file.h>
+#include <sys/filedesc.h>
#include <sys/limits.h>
#include <sys/lock.h>
#include <sys/malloc.h>
@@ -611,17 +612,19 @@
{
struct l_sockaddr *lsa;
struct sockaddr *sa;
- struct file *fp;
+ struct file *fp, *fp1;
int bflags, len;
struct socket *so;
int error, error1;
bflags = 0;
+ fp = NULL;
+ sa = NULL;
+
error = linux_set_socket_flags(flags, &bflags);
if (error != 0)
return (error);
- sa = NULL;
if (PTRIN(addr) == NULL) {
len = 0;
error = kern_accept4(td, s, NULL, NULL, bflags, NULL);
@@ -632,48 +635,54 @@
if (len < 0)
return (EINVAL);
error = kern_accept4(td, s, &sa, &len, bflags, &fp);
- if (error == 0)
- fdrop(fp, td);
}
+ /*
+ * Translate errno values into ones used by Linux.
+ */
if (error != 0) {
/*
* XXX. This is wrong, different sockaddr structures
* have different sizes.
*/
- if (error == EFAULT && namelen != sizeof(struct sockaddr_in))
- {
- error = EINVAL;
- goto out;
- }
- if (error == EINVAL) {
- error1 = getsock_cap(td, s, &cap_accept_rights, &fp, NULL, NULL);
+ switch (error) {
+ case EFAULT:
+ if (namelen != sizeof(struct sockaddr_in))
+ error = EINVAL;
+ break;
+ case EINVAL:
+ error1 = getsock_cap(td, s, &cap_accept_rights, &fp1, NULL, NULL);
if (error1 != 0) {
error = error1;
- goto out;
+ break;
}
- so = fp->f_data;
+ so = fp1->f_data;
if (so->so_type == SOCK_DGRAM)
error = EOPNOTSUPP;
- fdrop(fp, td);
+ fdrop(fp1, td);
+ break;
}
- goto out;
+ return (error);
}
- if (len != 0 && error == 0) {
+ if (len != 0) {
error = bsd_to_linux_sockaddr(sa, &lsa, len);
if (error == 0)
error = copyout(lsa, PTRIN(addr), len);
free(lsa, M_SONAME);
- }
- free(sa, M_SONAME);
+ /*
+ * XXX: We should also copyout the len, shouldn't we?
+ */
-out:
- if (error != 0) {
- (void)kern_close(td, td->td_retval[0]);
- td->td_retval[0] = 0;
+ if (error != 0) {
+ fdclose(td, fp, td->td_retval[0]);
+ td->td_retval[0] = 0;
+ }
}
+ if (fp != NULL)
+ fdrop(fp, td);
+ free(sa, M_SONAME);
return (error);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 22, 10:37 AM (4 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24032328
Default Alt Text
D25461.id73959.diff (2 KB)

Event Timeline