Skip to contentSkip to conversation

ipset: fix timeout data type size

PATCH In review Nikolay Martynov 2 participants 3 messages Oct 31, 2013 – Nov 11, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipset: fix timeout data type size

Currently it is impossible to set timeout on some architectures (MIPS ar71xx at least) because timeout is parsed into long long data type but used as uint32 without proper conversion. This patch fixes this issue. Tested on ar71xx router.

---
 lib/parse.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
lib/parse.c +8 -3
index 8ea8542..440ef8f 100644
@@ -1292,15 +1292,20 @@ ipset_parse_timeout(struct ipset_session *session,
 		    enum ipset_opt opt, const char *str)
 {
 	int err;
-	unsigned long long num = 0;
+	unsigned long long llnum = 0;
+	uint32_t num = 0;
 
 	assert(session);
 	assert(opt == IPSET_OPT_TIMEOUT);
 	assert(str);
 
-	err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &num);
-	if (err == 0)
+	err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &llnum);
+	if (err == 0) {
+		/* Timeout is expected to be 32bits wide, so we have
+		   to convert it here */
+		num = llnum;
 		return ipset_session_data_set(session, opt, &num);
+	}
 
 	return err;
 }
Signature · 2 lines
Thanks.
Nikolay.
#1 lore raw

Hi.

I've sent this patch for ipset some time ago. It fixes a bug that
surfaces itself on some platforms (notably on mips routers running openwrt). Unfortunately I have not seen any feedback/response to this patch. Is something wrong with the proposed fix or with patch itself? Could you please let me know.

Thanks!

2013/10/31 Nikolay Martynov <[email protected]>:

Quoted 42 lines

Currently it is impossible to set timeout on some architectures (MIPS ar71xx at least) because timeout is parsed into long long data type but used as uint32 without proper conversion. This patch fixes this issue. Tested on ar71xx router.

---
 lib/parse.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
lib/parse.c +8 -4
index 8ea8542..440ef8f 100644
@@ -1292,15 +1292,20 @@ ipset_parse_timeout(struct ipset_session *session,
                    enum ipset_opt opt, const char *str)
 {
        int err;
-       unsigned long long num = 0;
+       unsigned long long llnum = 0;
+       uint32_t num = 0;
 
        assert(session);
        assert(opt == IPSET_OPT_TIMEOUT);
        assert(str);
 
-       err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &num);
-       if (err == 0)
+       err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &llnum);
+       if (err == 0) {
+               /* Timeout is expected to be 32bits wide, so we have
+                  to convert it here */
+               num = llnum;
                return ipset_session_data_set(session, opt, &num);
+       }
 
        return err;
 }
--

Thanks.
Nikolay.

Signature · 2 lines
Martynov Nikolay.
Email: [email protected]
#2 lore raw
In reply to Nikolay Martynov
Quoted 4 lines · Nikolay Martynov

Currently it is impossible to set timeout on some architectures (MIPS ar71xx at least) because timeout is parsed into long long data type but used as uint32 without proper conversion. This patch fixes this issue. Tested on ar71xx router.

Patch is applied, thanks!

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary