| @@ -3,7 +3,7 @@ · 2 unmodified lines |
| 3 | 3 | * |
| 4 | 4 | * (C) 2001 by Jay Schulist <jschlst@samba.org>, |
| 5 | 5 | * (C) 2002-2005 by Harald Welte <laforge@gnumonks.org> |
| 6 | | − * (C) 2005,2007 by Pablo Neira Ayuso <pablo@netfilter.org> |
| 6 | + * (C) 2005-2017 by Pablo Neira Ayuso <pablo@netfilter.org> |
| 7 | 7 | * |
| 8 | 8 | * Initial netfilter messages via netlink development funded and |
| 9 | 9 | * generally made possible by Network Robots, Inc. (www.networkrobots.com) |
| @@ -273,7 +273,7 @@ enum { · 263 unmodified lines |
| 273 | 273 | }; |
| 274 | 274 | |
| 275 | 275 | static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, |
| 276 | | − u16 subsys_id) |
| 276 | + u16 subsys_id, u32 genid) |
| 277 | 277 | { |
| 278 | 278 | struct sk_buff *oskb = skb; |
| 279 | 279 | struct net *net = sock_net(skb->sk); |
| @@ -315,6 +315,12 @@ replay: · 35 unmodified lines |
| 315 | 315 | return kfree_skb(skb); |
| 316 | 316 | } |
| 317 | 317 | |
| 318 | + if (genid && ss->valid_genid && !ss->valid_genid(net, genid)) { |
| 319 | + nfnl_unlock(subsys_id); |
| 320 | + netlink_ack(oskb, nlh, -ERESTART); |
| 321 | + return kfree_skb(skb); |
| 322 | + } |
| 323 | + |
| 318 | 324 | while (skb->len >= nlmsg_total_size(0)) { |
| 319 | 325 | int msglen, type; |
| 320 | 326 | |
| @@ -436,11 +442,20 @@ done: · 115 unmodified lines |
| 436 | 442 | kfree_skb(skb); |
| 437 | 443 | } |
| 438 | 444 | |
| 445 | +static const struct nla_policy nfnl_batch_policy[NFNL_BATCH_MAX + 1] = { |
| 446 | + [NFNL_BATCH_GENID] = { .type = NLA_U32 }, |
| 447 | +}; |
| 448 | + |
| 439 | 449 | static void nfnetlink_rcv_skb_batch(struct sk_buff *skb, struct nlmsghdr *nlh) |
| 440 | 450 | { |
| 451 | + int min_len = nlmsg_total_size(sizeof(struct nfgenmsg)); |
| 452 | + struct nlattr *attr = (void *)nlh + min_len; |
| 453 | + struct nlattr *cda[NFNL_BATCH_MAX + 1]; |
| 454 | + int attrlen = nlh->nlmsg_len - min_len; |
| 441 | 455 | struct nfgenmsg *nfgenmsg; |
| 456 | + int msglen, err; |
| 457 | + u32 gen_id = 0; |
| 442 | 458 | u16 res_id; |
| 443 | | − int msglen; |
| 444 | 459 | |
| 445 | 460 | msglen = NLMSG_ALIGN(nlh->nlmsg_len); |
| 446 | 461 | if (msglen > skb->len) |
| @@ -450,6 +465,14 @@ static void nfnetlink_rcv_skb_batch(struct sk_buff *skb, struct nlmsghdr *nlh) · 3 unmodified lines |
| 450 | 465 | skb->len < NLMSG_HDRLEN + sizeof(struct nfgenmsg)) |
| 451 | 466 | return; |
| 452 | 467 | |
| 468 | + err = nla_parse(cda, NFNL_BATCH_MAX, attr, attrlen, nfnl_batch_policy); |
| 469 | + if (err < 0) { |
| 470 | + netlink_ack(skb, nlh, err); |
| 471 | + return; |
| 472 | + } |
| 473 | + if (cda[NFNL_BATCH_GENID]) |
| 474 | + gen_id = ntohl(nla_get_be32(cda[NFNL_BATCH_GENID])); |
| 475 | + |
| 453 | 476 | nfgenmsg = nlmsg_data(nlh); |
| 454 | 477 | skb_pull(skb, msglen); |
| 455 | 478 | /* Work around old nft using host byte order */ |
| @@ -458,7 +481,7 @@ static void nfnetlink_rcv_skb_batch(struct sk_buff *skb, struct nlmsghdr *nlh) · 2 unmodified lines |
| 458 | 481 | else |
| 459 | 482 | res_id = ntohs(nfgenmsg->res_id); |
| 460 | 483 | |
| 461 | | − nfnetlink_rcv_batch(skb, nlh, res_id); |
| 484 | + nfnetlink_rcv_batch(skb, nlh, res_id, gen_id); |
| 462 | 485 | } |
| 463 | 486 | |
| 464 | 487 | static void nfnetlink_rcv(struct sk_buff *skb) |