anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-07 13:15:12 +02:00
Code Issues Releases Wiki Activity

ipset: update to 4.3+git3

Browse Source
This commit is contained in:
Jan Engelhardt
2010-09-22 22:41:24 +02:00
parent 59401339b8
commit 98b853cea3
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/ipset/ip_set.c
View File

@@ -929,11 +929,11 @@ ip_set_sockfn_set(struct sock *sk, int optval, void *user, unsigned int len)
} }
if (copy_from_user(data, user, len) != 0) { if (copy_from_user(data, user, len) != 0) {
res = -EFAULT; res = -EFAULT;
goto done; goto cleanup;
} }
if (down_interruptible(&ip_set_app_mutex)) { if (down_interruptible(&ip_set_app_mutex)) {
res = -EINTR; res = -EINTR;
goto done; goto cleanup;
} }
op = (unsigned *)data; op = (unsigned *)data;
@@ -1109,6 +1109,7 @@ ip_set_sockfn_set(struct sock *sk, int optval, void *user, unsigned int len)
done: done:
up(&ip_set_app_mutex); up(&ip_set_app_mutex);
cleanup:
vfree(data); vfree(data);
if (res > 0) if (res > 0)
res = 0; res = 0;
@@ -1142,11 +1143,11 @@ ip_set_sockfn_get(struct sock *sk, int optval, void *user, int *len)
} }
if (copy_from_user(data, user, *len) != 0) { if (copy_from_user(data, user, *len) != 0) {
res = -EFAULT; res = -EFAULT;
goto done; goto cleanup;
} }
if (down_interruptible(&ip_set_app_mutex)) { if (down_interruptible(&ip_set_app_mutex)) {
res = -EINTR; res = -EINTR;
goto done; goto cleanup;
} }
op = (unsigned *) data; op = (unsigned *) data;
@@ -1439,6 +1440,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void *user, int *len)
done: done:
up(&ip_set_app_mutex); up(&ip_set_app_mutex);
cleanup:
vfree(data); vfree(data);
if (res > 0) if (res > 0)
res = 0; res = 0;

6
extensions/ipset/ipset.8
View File

@@ -502,9 +502,13 @@ data storage in
set and add src to the first single or src,dst to the first double set and add src to the first single or src,dst to the first double
data storage set in data storage set in
\fIb\fP. \fIb\fP.
.P
You can imagine a setlist type of set as an ordered union of You can imagine a setlist type of set as an ordered union of
the set elements. the set elements.
.P
Please note: by the ipset command you can add, delete and
.B test
the setnames in a setlist type of set, and not the presence of
a set's member (such as an IP address).
.SH GENERAL RESTRICTIONS .SH GENERAL RESTRICTIONS
Setnames starting with colon (:) cannot be defined. Zero valued set Setnames starting with colon (:) cannot be defined. Zero valued set
entries cannot be used with hash type of sets. entries cannot be used with hash type of sets.