: fix various extension problems with '!' and ttl extension (updated)
PATCH 1/1 : fix various extension problems with '!' and ttl extension (updated)
Here is an updated version. It fixes problems with "!" in
libip6t_mark.clibip6t_owner.clibipt_connmark.clibipt_ecn.clibipt_helper.clibipt_mark.clibipt_owner.clibipt_realm.c
(It should fix them, i only tested owner)
Also a ttl extension bug is fixed:
# /usr/local/sbin/iptables -A INPUT -m ttl --ttl-eq 1 -p udp --dport 1024: iptables v1.2.7a: Can't specify TTL option twice
Regards,
Patrick
Index: extensions/libip6t_mark.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libip6t_mark.c,v retrieving revision 1.4
libip6t_mark.c +3 -3
@@ -46,13 +46,13 @@char *end;case '1' :check_inverse (optarg, &invert, &optind,0 ); - markinfo->mark =strtoul (optarg, &end,0 ); + markinfo->mark =strtoul (argv[optind-1 ], &end,0 );if (*end =='/' ) { markinfo->mask =strtoul (end+1 , &end,0 ); }else markinfo->mask =0xffffffff ; -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad MARK value `%s'" , optarg); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad MARK value `%s'" , argv[optind-1 ]);if (invert) markinfo->invert =1 ; *flags =1 ;
Index: extensions/libip6t_owner.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libip6t_owner.c,v retrieving revision 1.4
libip6t_owner.c +14 -14
@@ -57,12 +57,12 @@case '1' :check_inverse (optarg, &invert, &optind,0 ); -if ((pwd =getpwnam (optarg))) +if ((pwd =getpwnam (argv[optind-1 ]))) ownerinfo->uid = pwd->pw_uid;else { - ownerinfo->uid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER UID value `%s'" , optarg); + ownerinfo->uid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER UID value `%s'" , argv[optind-1 ]); }if (invert) ownerinfo->invert |=IP6T_OWNER_UID ;
@@ -72,12 +72,12 @@case '2' :check_inverse (optarg, &invert, &optind,0 ); -if ((grp =getgrnam (optarg))) +if ((grp =getgrnam (argv[optind-1 ]))) ownerinfo->gid = grp->gr_gid;else { - ownerinfo->gid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER GID value `%s'" , optarg); + ownerinfo->gid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER GID value `%s'" , argv[optind-1 ]); }if (invert) ownerinfo->invert |=IP6T_OWNER_GID ;
@@ -87,9 +87,9 @@case '3' :check_inverse (optarg, &invert, &optind,0 ); - ownerinfo->pid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER PID value `%s'" , optarg); + ownerinfo->pid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER PID value `%s'" , argv[optind-1 ]);if (invert) ownerinfo->invert |=IP6T_OWNER_PID ; ownerinfo->match |=IP6T_OWNER_PID ;
@@ -98,9 +98,9 @@case '4' :check_inverse (optarg, &invert, &optind,0 ); - ownerinfo->sid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER SID value `%s'" , optarg); + ownerinfo->sid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER SID value `%s'" , argv[optind-1 ]);if (invert) ownerinfo->invert |=IP6T_OWNER_SID ; ownerinfo->match |=IP6T_OWNER_SID ;
Index: extensions/libipt_connmark.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libipt_connmark.c,v retrieving revision 1.5
libipt_connmark.c +3 -3
@@ -46,13 +46,13 @@char *end;case '1' :check_inverse (optarg, &invert, &optind,0 ); - markinfo->mark =strtoul (optarg, &end,0 ); + markinfo->mark =strtoul (argv[optind-1 ], &end,0 );if (*end =='/' ) { markinfo->mask =strtoul (end+1 , &end,0 ); }else markinfo->mask =0xffffffff ; -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad MARK value `%s'" , optarg); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad MARK value `%s'" , argv[optind-1 ]);if (invert) markinfo->invert =1 ; *flags =1 ;
Index: extensions/libipt_ecn.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libipt_ecn.c,v retrieving revision 1.3
libipt_ecn.c +1 -1
@@ -80,7 +80,7 @@ einfo->invert |=IPT_ECN_OP_MATCH_IP ; *flags |=IPT_ECN_OP_MATCH_IP ; einfo->operation |=IPT_ECN_OP_MATCH_IP ; -if (string_to_number (optarg,0 ,3 , &result)) +if (string_to_number (argv[optind-1 ],0 ,3 , &result))exit_error (PARAMETER_PROBLEM ,"ECN match: Value out of range" ); einfo->ip_ect = result;
Index: extensions/libipt_helper.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libipt_helper.c,v retrieving revision 1.3
libipt_helper.c +2 -2
@@ -44,8 +44,8 @@switch (c) {case '1' : -check_inverse (optarg, &invert, &invert,0 ); -strncpy (info->name, optarg,29 ); +check_inverse (optarg, &invert, &optind,0 ); +strncpy (info->name, argv[optind-1 ],29 );if (invert) info->invert =1 ; *flags =1 ;
Index: extensions/libipt_mark.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libipt_mark.c,v retrieving revision 1.8
libipt_mark.c +3 -3
@@ -46,13 +46,13 @@char *end;case '1' :check_inverse (optarg, &invert, &optind,0 ); - markinfo->mark =strtoul (optarg, &end,0 ); + markinfo->mark =strtoul (argv[optind-1 ], &end,0 );if (*end =='/' ) { markinfo->mask =strtoul (end+1 , &end,0 ); }else markinfo->mask =0xffffffff ; -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad MARK value `%s'" , optarg); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad MARK value `%s'" , argv[optind-1 ]);if (invert) markinfo->invert =1 ; *flags =1 ;
Index: extensions/libipt_owner.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libipt_owner.c,v retrieving revision 1.9
libipt_owner.c +18 -17
@@ -71,12 +71,12 @@struct group *grp;case '1' :check_inverse (optarg, &invert, &optind,0 ); -if ((pwd =getpwnam (optarg))) +if ((pwd =getpwnam (argv[optind-1 ]))) ownerinfo->uid = pwd->pw_uid;else { - ownerinfo->uid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER UID value `%s'" , optarg); + ownerinfo->uid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER UID value `%s'" , argv[optind-1 ]); }if (invert) ownerinfo->invert |=IPT_OWNER_UID ;
@@ -86,12 +86,12 @@case '2' :check_inverse (optarg, &invert, &optind,0 ); -if ((grp =getgrnam (optarg))) +if ((grp =getgrnam (argv[optind-1 ]))) ownerinfo->gid = grp->gr_gid;else { - ownerinfo->gid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER GID value `%s'" , optarg); + ownerinfo->gid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER GID value `%s'" , argv[optind-1 ]); }if (invert) ownerinfo->invert |=IPT_OWNER_GID ;
@@ -101,9 +101,9 @@case '3' :check_inverse (optarg, &invert, &optind,0 ); - ownerinfo->pid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER PID value `%s'" , optarg); + ownerinfo->pid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER PID value `%s'" , argv[optind-1 ]);if (invert) ownerinfo->invert |=IPT_OWNER_PID ; ownerinfo->match |=IPT_OWNER_PID ;
@@ -112,9 +112,9 @@case '4' :check_inverse (optarg, &invert, &optind,0 ); - ownerinfo->sid =strtoul (optarg, &end,0 ); -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad OWNER SID value `%s'" , optarg); + ownerinfo->sid =strtoul (argv[optind-1 ], &end,0 ); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad OWNER SID value `%s'" , argv[optind-1 ]);if (invert) ownerinfo->invert |=IPT_OWNER_SID ; ownerinfo->match |=IPT_OWNER_SID ;
@@ -124,10 +124,11 @@#ifdef IPT_OWNER_COMM case '5' :check_inverse (optarg, &invert, &optind,0 ); -if (strlen (optarg) >sizeof (ownerinfo->comm)) -exit_error (PARAMETER_PROBLEM ,"OWNER CMD `%s' too long, max %d characters" , optarg,sizeof (ownerinfo->comm)); +if (strlen (argv[optind-1 ]) >sizeof (ownerinfo->comm)) +exit_error (PARAMETER_PROBLEM ,"OWNER CMD `%s' too long, max %d characters" , + argv[optind-1 ],sizeof (ownerinfo->comm)); -strncpy (ownerinfo->comm, optarg,sizeof (ownerinfo->comm)); +strncpy (ownerinfo->comm, argv[optind-1 ],sizeof (ownerinfo->comm));if (invert) ownerinfo->invert |=IPT_OWNER_COMM ;
Index: extensions/libipt_realm.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libipt_realm.c,v retrieving revision 1.4
libipt_realm.c +3 -3
@@ -50,13 +50,13 @@char *end;case '1' :check_inverse (optarg, &invert, &optind,0 ); - realminfo->id =strtoul (optarg, &end,0 ); + realminfo->id =strtoul (argv[optind-1 ], &end,0 );if (*end =='/' ) { realminfo->mask =strtoul (end+1 , &end,0 ); }else realminfo->mask =0xffffffff ; -if (*end !='\0' || end == optarg) -exit_error (PARAMETER_PROBLEM ,"Bad REALM value `%s'" , optarg); +if (*end !='\0' || end == argv[optind-1 ]) +exit_error (PARAMETER_PROBLEM ,"Bad REALM value `%s'" , argv[optind-1 ]);if (invert) realminfo->invert =1 ; *flags =1 ;
Index: extensions/libipt_ttl.c
===================================================================
RCS file: /cvspublic/netfilter/userspace/extensions/libipt_ttl.c,v retrieving revision 1.6
libipt_ttl.c +30 -10
@@ -37,18 +37,18 @@struct ipt_ttl_info *info = (struct ipt_ttl_info *) (*match)->data;u_int8_t value; -check_inverse (optarg, &invert, &optind,0 ); - value =atoi (argv[optind-1 ]); - -if (*flags) -exit_error (PARAMETER_PROBLEM , -"Can't specify TTL option twice" ); - -if (!optarg) -exit_error (PARAMETER_PROBLEM , -"ttl: You must specify a value" );switch (c) {case '2' : +if (*flags) +exit_error (PARAMETER_PROBLEM , +"Can't specify TTL option twice" ); +if (!optarg) +exit_error (PARAMETER_PROBLEM , +"ttl: You must specify a value" ); + +check_inverse (optarg, &invert, &optind,0 ); + value =atoi (argv[optind-1 ]); +if (invert) info->mode =IPT_TTL_NE ;else
@@ -60,6 +60,16 @@break ;case '3' : +if (*flags) +exit_error (PARAMETER_PROBLEM , +"Can't specify TTL option twice" ); +if (!optarg) +exit_error (PARAMETER_PROBLEM , +"ttl: You must specify a value" ); + +check_inverse (optarg, &invert, &optind,0 ); + value =atoi (argv[optind-1 ]); +if (invert)exit_error (PARAMETER_PROBLEM ,"ttl: unexpected `!'" );
@@ -70,6 +80,16 @@break ;case '4' : +if (*flags) +exit_error (PARAMETER_PROBLEM , +"Can't specify TTL option twice" ); +if (!optarg) +exit_error (PARAMETER_PROBLEM , +"ttl: You must specify a value" ); + +check_inverse (optarg, &invert, &optind,0 ); + value =atoi (argv[optind-1 ]); +if (invert)exit_error (PARAMETER_PROBLEM ,"ttl: unexpected `!'" );