diff --git a/.arptables.metadata b/.arptables.metadata new file mode 100644 index 0000000..480ccde --- /dev/null +++ b/.arptables.metadata @@ -0,0 +1 @@ +4e8ad67f632c7232ae5eef721b0a7f260f32bca3 SOURCES/arptables-v0.0.4.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..064470d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/arptables-v0.0.4.tar.gz diff --git a/SOURCES/COPYING b/SOURCES/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/SOURCES/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/SOURCES/arptables-0.0.4-covscan_fix01_simple.patch b/SOURCES/arptables-0.0.4-covscan_fix01_simple.patch new file mode 100644 index 0000000..9c12c97 --- /dev/null +++ b/SOURCES/arptables-0.0.4-covscan_fix01_simple.patch @@ -0,0 +1,24 @@ +commit 461c0674967504fafe7feb7631c51e7fceb67753 +Author: Jaromír Končický +Date: Tue Oct 15 21:40:20 2013 +0200 + + make static analysis tool happy (false positive) + +diff --git a/userspace/arptables/arptables.c b/userspace/arptables/arptables.c +index 5535ab2..8ef445a 100644 +--- a/userspace/arptables/arptables.c ++++ b/userspace/arptables/arptables.c +@@ -1668,10 +1668,12 @@ static char *get_modprobe(void) + + ret = malloc(1024); + if (ret) { +- switch (read(procfile, ret, 1024)) { ++ int read_bytes = read(procfile, ret, 1024); ++ switch (read_bytes) { + case -1: goto fail; + case 1024: goto fail; /* Partial read. Wierd */ + } ++ ret[read_bytes] = '\0'; + if (ret[strlen(ret)-1]=='\n') + ret[strlen(ret)-1]=0; + close(procfile); diff --git a/SOURCES/arptables-0.0.4-covscan_fix02_buf_overflow.patch b/SOURCES/arptables-0.0.4-covscan_fix02_buf_overflow.patch new file mode 100644 index 0000000..b6d2cc3 --- /dev/null +++ b/SOURCES/arptables-0.0.4-covscan_fix02_buf_overflow.patch @@ -0,0 +1,88 @@ +commit fea55b0930d7cb67a3359185e53ef6b856b7721d +Author: Jaromír Končický +Date: Tue Oct 15 21:55:52 2013 +0200 + + fix potential buffer overflows reported by static analysis + +diff --git a/userspace/arptables/arptables.c b/userspace/arptables/arptables.c +index 8ef445a..4da6fea 100644 +--- a/userspace/arptables/arptables.c ++++ b/userspace/arptables/arptables.c +@@ -1270,7 +1270,7 @@ print_firewall(const struct arpt_entry *fw, + sprintf(buf, "%s", addr_to_dotted(&(fw->arp.src))); + else + sprintf(buf, "%s", addr_to_anyname(&(fw->arp.src))); +- strcat(buf, mask_to_dotted(&(fw->arp.smsk))); ++ strncat(buf, mask_to_dotted(&(fw->arp.smsk)), sizeof(buf) - strlen(buf) -1); + printf("-s %s ", buf); + } + +@@ -1294,7 +1294,7 @@ after_devsrc: + sprintf(buf, "%s", addr_to_dotted(&(fw->arp.tgt))); + else + sprintf(buf, "%s", addr_to_anyname(&(fw->arp.tgt))); +- strcat(buf, mask_to_dotted(&(fw->arp.tmsk))); ++ strncat(buf, mask_to_dotted(&(fw->arp.tmsk)), sizeof(buf) - strlen(buf) -1); + printf("-d %s ", buf); + } + +@@ -1796,7 +1796,7 @@ int do_command(int argc, char *argv[], char **table, arptc_handle_t *handle) + *table, arptc_strerror(errno)); + } + } +- } ++ } + + memset(&fw, 0, sizeof(fw)); + opts = original_opts; +@@ -2064,7 +2064,8 @@ int do_command(int argc, char *argv[], char **table, arptc_handle_t *handle) + + target->t = fw_calloc(1, size); + target->t->u.target_size = size; +- strcpy(target->t->u.user.name, jumpto); ++ strncpy(target->t->u.user.name, jumpto, sizeof(target->t->u.user.name)); ++ target->t->u.user.name[sizeof(target->t->u.user.name)-1] = '\0'; + /* + target->init(target->t, &fw.nfcache); + */ +diff --git a/userspace/arptables/libarptc/libarptc_incl.c b/userspace/arptables/libarptc/libarptc_incl.c +index 2fa3d43..9c1aeac 100644 +--- a/userspace/arptables/libarptc/libarptc_incl.c ++++ b/userspace/arptables/libarptc/libarptc_incl.c +@@ -209,8 +209,10 @@ alloc_handle(const char *tablename, unsigned int size, unsigned int num_rules) + h->counter_map = (void *)h + + sizeof(STRUCT_TC_HANDLE) + + size; +- strcpy(h->info.name, tablename); +- strcpy(h->entries.name, tablename); ++ strncpy(h->info.name, tablename, sizeof(h->info.name)); ++ h->info.name[sizeof(h->info.name)-1] = '\0'; ++ strncpy(h->entries.name, tablename, sizeof(h->entries.name)); ++ h->entries.name[sizeof(h->entries.name)-1] = '\0'; + + return h; + } +@@ -357,8 +359,9 @@ add_chain(STRUCT_ENTRY *e, TC_HANDLE_T h, STRUCT_ENTRY **prev) + h->cache_chain_heads[h->cache_num_chains-1].end + = *prev; + +- strcpy(h->cache_chain_heads[h->cache_num_chains].name, +- (const char *)GET_TARGET(e)->data); ++ strncpy(h->cache_chain_heads[h->cache_num_chains].name, ++ (const char *)GET_TARGET(e)->data, TABLE_MAXNAMELEN-1); ++ h->cache_chain_heads[h->cache_num_chains].name[TABLE_MAXNAMELEN-1] = '\0'; + h->cache_chain_heads[h->cache_num_chains].start + = (void *)e + e->next_offset; + h->cache_num_chains++; +@@ -368,8 +371,9 @@ add_chain(STRUCT_ENTRY *e, TC_HANDLE_T h, STRUCT_ENTRY **prev) + h->cache_chain_heads[h->cache_num_chains-1].end + = *prev; + +- strcpy(h->cache_chain_heads[h->cache_num_chains].name, +- h->hooknames[builtin-1]); ++ strncpy(h->cache_chain_heads[h->cache_num_chains].name, ++ h->hooknames[builtin-1], TABLE_MAXNAMELEN-1); ++ h->cache_chain_heads[h->cache_num_chains].name[TABLE_MAXNAMELEN-1] = '\0'; + h->cache_chain_heads[h->cache_num_chains].start + = (void *)e; + h->cache_num_chains++; diff --git a/SOURCES/arptables-0.0.4-man-install.patch b/SOURCES/arptables-0.0.4-man-install.patch new file mode 100644 index 0000000..8cdcb49 --- /dev/null +++ b/SOURCES/arptables-0.0.4-man-install.patch @@ -0,0 +1,55 @@ +commit 9ce0571805f97 + f43b499751a79 +Author: Jesper Dangaard Brouer +Date: Thu Nov 14 13:37:39 2013 +0100 + + arptables: Add man pages for arptables-{save,restore} + + Also fixed up the Makefile to install these man pages. + + Signed-off-by: Jesper Dangaard Brouer + + +diff --git a/userspace/arptables/Makefile b/userspace/arptables/Makefile +index 38158d9..7bead0d 100644 +--- a/userspace/arptables/Makefile ++++ b/userspace/arptables/Makefile +@@ -6,10 +6,13 @@ PREFIX:=/usr/local + LIBDIR:=$(PREFIX)/lib + BINDIR:=$(PREFIX)/sbin + MANDIR:=$(PREFIX)/man ++man8dir=$(MANDIR)/man8 + INITDIR:=/etc/rc.d/init.d + SYSCONFIGDIR:=/etc/sysconfig + DESTDIR:= + ++MANS = arptables.8 arptables-save.8 arptables-restore.8 ++ + COPT_FLAGS:=-O2 + CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG + +@@ -36,10 +39,6 @@ libarptc/libarptc.a: libarptc/libarptc.o + arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + +-$(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8 +- mkdir -p $(@D) +- install -m 0644 $< $@ +- + $(DESTDIR)$(BINDIR)/arptables: arptables + mkdir -p $(DESTDIR)$(BINDIR) + install -m 0755 $< $@ +@@ -57,8 +56,13 @@ scripts: arptables-save arptables-restore arptables.sysv + if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi + rm -f arptables-save_ arptables-restore_ arptables.sysv_ + ++.PHONY: install-man ++install-man: $(MANS) ++ [ -d "$(DESTDIR)$(man8dir)" ] || mkdir -p "$(DESTDIR)$(man8dir)" ++ install -m 0644 $^ $(DESTDIR)$(man8dir)/ ++ + .PHONY: install +-install: $(DESTDIR)$(MANDIR)/man8/arptables.8 $(DESTDIR)$(BINDIR)/arptables scripts ++install: install-man $(DESTDIR)$(BINDIR)/arptables scripts + + .PHONY: clean + clean: diff --git a/SOURCES/arptables-0.0.4-set-counters-option.patch b/SOURCES/arptables-0.0.4-set-counters-option.patch new file mode 100644 index 0000000..a43cbbf --- /dev/null +++ b/SOURCES/arptables-0.0.4-set-counters-option.patch @@ -0,0 +1,55 @@ +commit ba6234638d04400cf94adf350ccfa7005d078b4a +Author: Jesper Dangaard Brouer +Date: Sun Mar 2 22:08:30 2014 +0100 + + arptables: add missing long option --set-counters and update documentation + + The long option "--set-counters" where missing in option parsing. + And the corresponding short option "-c" were not mentioned in + the help usage text. + + Also update the arptables man page with a description + of the parameter. + + Signed-off-by: Jesper Dangaard Brouer + +diff --git a/userspace/arptables/arptables.8 b/userspace/arptables/arptables.8 +index 0b6b62e1a7ef..78b2c60978c4 100644 +--- a/userspace/arptables/arptables.8 ++++ b/userspace/arptables/arptables.8 +@@ -215,6 +215,14 @@ The target of the rule. This is one of the following values: + a target extension (see + .BR "TARGET EXTENSIONS" ")" + or a user-defined chain name. ++.TP ++.BI "-c, --set-counters " "PKTS BYTES" ++This enables the administrator to initialize the packet and byte ++counters of a rule (during ++.B INSERT, ++.B APPEND, ++.B REPLACE ++operations). + + .SS RULE-SPECIFICATIONS + The following command line arguments make up a rule specification (as used +diff --git a/userspace/arptables/arptables.c b/userspace/arptables/arptables.c +index 4da6fea980bb..3fb8ed5c40e7 100644 +--- a/userspace/arptables/arptables.c ++++ b/userspace/arptables/arptables.c +@@ -152,6 +152,7 @@ static struct option original_opts[] = { + { "help", 2, 0, 'h' }, + { "line-numbers", 0, 0, '0' }, + { "modprobe", 1, 0, 'M' }, ++ { "set-counters", 1, 0, 'c' }, + { 0 } + }; + +@@ -529,7 +530,7 @@ exit_printhelp(void) + " --line-numbers print line numbers when listing\n" + " --exact -x expand numbers (display exact values)\n" + " --modprobe= try to insert modules using this command\n" +-" --set-counters PKTS BYTES set the counter during insert/append\n" ++" --set-counters -c PKTS BYTES set the counter during insert/append\n" + "[!] --version -V print package version.\n"); + printf(" opcode strings: \n"); + for (i = 0; i < NUMOPCODES; i++) diff --git a/SOURCES/arptables-helper b/SOURCES/arptables-helper new file mode 100644 index 0000000..11685ab --- /dev/null +++ b/SOURCES/arptables-helper @@ -0,0 +1,104 @@ +#!/bin/sh +# config: /etc/sysconfig/arptables + +# Source 'em up +. /etc/init.d/functions + +ARPTABLES_CONFIG=/etc/sysconfig/arptables + +arp_table() { + if fgrep -qsx $1 /proc/net/arp_tables_names; then + arptables -t "$@" + fi +} + +flush_delete_chains() { + chains=$(cat /proc/net/arp_tables_names 2>/dev/null) + echo -n $"Flushing all chains:" + let ret=0 + for i in $chains; do arptables -t $i -F; let ret+=$?; done + arptables -F; let ret+=$? + if [ $ret -eq 0 ]; then + success + else + failure + fi + echo + + echo -n $"Removing user defined chains:" + let ret=0 + for i in $chains; do arptables -t $i -X; let ret+=$?; done + arptables -X; let ret+=$? + if [ $ret -eq 0 ]; then + success + else + failure + fi + echo +} + +start() { + if [ ! -x /usr/sbin/arptables ]; then + exit 4 + fi + + # don't do squat if we don't have the config file + if [ -f $ARPTABLES_CONFIG ]; then + # If we don't clear these first, we might be adding to + # pre-existing rules. + flush_delete_chains + + for i in $(cat /proc/net/arp_tables_names 2>/dev/null); do + arptables -t $i -Z; + done + + echo -n $"Applying arptables firewall rules: " + /usr/sbin/arptables-restore < $ARPTABLES_CONFIG && \ + success || \ + failure + echo + touch /var/lock/subsys/arptables + else + failure + echo + echo $"Configuration file /etc/sysconfig/arptables missing" + exit 6 + fi +} + +stop() { + flush_delete_chains + echo -n $"Resetting built-in chains to the default ACCEPT policy:" + arp_table filter -P INPUT ACCEPT && \ + arp_table filter -P OUTPUT ACCEPT && \ + success || \ + failure + echo + rm -f /var/lock/subsys/arptables +} + +case "$1" in +start) + start + ;; + +stop) + stop + ;; + +restart|reload) + # "restart" is really just "start" as this isn't a daemon, + # and "start" clears any pre-defined rules anyway. + # This is really only here to make those who expect it happy + start + ;; + +condrestart|try-restart|force-reload) + [ -e /var/lock/subsys/arptables ] && start + ;; + +*) + exit 2 +esac + +exit 0 diff --git a/SOURCES/arptables-restore.8 b/SOURCES/arptables-restore.8 new file mode 100644 index 0000000..4f2f623 --- /dev/null +++ b/SOURCES/arptables-restore.8 @@ -0,0 +1,41 @@ +.TH ARPTABLES-RESTORE 8 "Nov 07, 2013" "" "" +.\" +.\" Man page written by Jesper Dangaard Brouer based on a +.\" Man page written by Harald Welte +.\" It is based on the iptables-restore man page. +.\" +.\" This program is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" This program is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program; if not, write to the Free Software +.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +.\" +.\" +.SH NAME +arptables-restore \(em Restore ARP Tables +.SH SYNOPSIS +\fBarptables\-restore +.SH DESCRIPTION +.PP +.B arptables-restore +is used to restore ARP Tables from data specified on STDIN or +via a file as first argument. +Use I/O redirection provided by your shell to read from a file +.TP +.B arptables-restore +flushes (deletes) all previous contents of the respective ARP Table. +.SH BUGS +None known as of arptables-0.0.4 release +.SH AUTHOR +Jesper Dangaard Brouer +.SH SEE ALSO +\fBarptables\-save\fP(8), \fBarptables\fP(8) +.PP diff --git a/SOURCES/arptables-save.8 b/SOURCES/arptables-save.8 new file mode 100644 index 0000000..34791a9 --- /dev/null +++ b/SOURCES/arptables-save.8 @@ -0,0 +1,37 @@ +.TH ARPTABLES-SAVE 8 "Nov 07, 2013" "" "" +.\" +.\" Man page written by Jesper Dangaard Brouer based on a +.\" Man page written by Harald Welte +.\" It is based on the iptables-save man page. +.\" +.\" This program is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" This program is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program; if not, write to the Free Software +.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +.\" +.\" +.SH NAME +arptables-save \(em dump arptables rules to stdout +.SH SYNOPSIS +\fBarptables\-save +.SH DESCRIPTION +.PP +.B arptables-save +is used to dump the contents of an ARP Table in easily parseable format +to STDOUT. Use I/O-redirection provided by your shell to write to a file. +.SH BUGS +None known as of arptables-0.0.4 release +.SH AUTHOR +Jesper Dangaard Brouer +.SH SEE ALSO +\fBarptables\-restore\fP(8), \fBarptables\fP(8) +.PP diff --git a/SOURCES/arptables.service b/SOURCES/arptables.service new file mode 100644 index 0000000..df6c7d6 --- /dev/null +++ b/SOURCES/arptables.service @@ -0,0 +1,12 @@ +[Unit] +Description=Automates a packet filtering firewall with arptables +After=network.target + +[Service] +Type=oneshot +ExecStart=/usr/libexec/arptables-helper start +ExecStop=/usr/libexec/arptables-helper stop +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/SPECS/arptables.spec b/SPECS/arptables.spec new file mode 100644 index 0000000..af148d2 --- /dev/null +++ b/SPECS/arptables.spec @@ -0,0 +1,111 @@ +Summary: User space tool to set up tables of ARP rules in kernel +Name: arptables +Version: 0.0.4 +Release: 8%{?dist} +License: GPLv2+ +Group: System Environment/Base + +URL: http://ebtables.sourceforge.net/ +Source0: http://downloads.sourceforge.net/ebtables/arptables/arptables-v%{version}.tar.gz +Source1: arptables.service +Source2: arptables-helper +# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +# http://marc.info/?l=netfilter-devel&m=137908241011194&w=2 +Source3: COPYING +Source4: arptables-save.8 +Source5: arptables-restore.8 + +Patch1: arptables-0.0.4-covscan_fix01_simple.patch +Patch2: arptables-0.0.4-covscan_fix02_buf_overflow.patch +Patch3: arptables-0.0.4-man-install.patch +Patch4: arptables-0.0.4-set-counters-option.patch + +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +Obsoletes: arptables_jf < 0.0.8-37 +Provides: arptables_jf = 0.0.8-37 + +%description +The arptables is a user space tool used to set up and maintain +the tables of ARP rules in the Linux kernel. These rules inspect +the ARP frames which they see. arptables is analogous to the iptables +user space tool, but is less complicated. + +%prep +%setup -q -n arptables-v%{version} +%patch1 -p3 -b .covscan_fix01_simple +%patch2 -p3 -b .covscan_fix02_buf_overflow +%patch3 -p3 -b .man-install +%patch4 -p3 -b .set-counters-option + +cp %{SOURCE3} COPYING +cp %{SOURCE4} . +cp %{SOURCE5} . + +%build +# Makefile uses $(KERNEL_DIR) to redefine where to look for header files. +# But when it's set to standard system include directory gcc ignores it +# (see gcc(1)). It however looks that the code is not ready for using +# system headers (instead included ones) so we don't use this option. +make all 'COPT_FLAGS=%{optflags}' %{_smp_mflags} + +%install +make install DESTDIR=%{buildroot} BINDIR=%{_sbindir} MANDIR=%{_mandir} + +install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/arptables.service +mkdir -p %{buildroot}%{_libexecdir}/ +install -p -D -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/ +rm -rf %{buildroot}%{_initrddir} +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +echo '# Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables + +%post +%systemd_post arptables.service + +%preun +%systemd_preun arptables.service + +%postun +%systemd_postun_with_restart arptables.service + + +%files +%doc COPYING +%{_sbindir}/arptables* +%{_libexecdir}/arptables-helper +%{_mandir}/*/arptables* +%{_unitdir}/arptables.service +%config(noreplace) %{_sysconfdir}/sysconfig/arptables + +%changelog +* Wed Jun 8 2016 Jesper Dangaard Brouer - 0.0.4-8 +- Add missing long option --set-counters and update documentation + Corrosponding short option -c was implemented, but undocumented. + Resolves: rhbz#1050854 + +* Fri Jan 24 2014 Daniel Mach - 0.0.4-7 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 0.0.4-6 +- Mass rebuild 2013-12-27 + +* Thu Nov 14 2013 Jesper Dangaard Brouer - 0.0.4-5 +- fix issues reported by static analysis tools + Resolves: rhbz#1027762 +- add man-pages for arptables-{save,restore} + Resolves: rhbz#1025726 + +* Mon Sep 16 2013 Jiri Popelka - 0.0.4-4 +- revert previous change, the code is not ready for this + +* Mon Sep 16 2013 Jiri Popelka - 0.0.4-3 +- use system kernel headers + +* Fri Sep 13 2013 Jiri Popelka - 0.0.4-2 +- install with '-p' (#1007964) + +* Fri Sep 13 2013 Jiri Popelka - 0.0.4-1 +- renamed arptables_jf to arptables