[PATCH] Remove duplicate checkings in nfnetlink_check_attributes nfnetlink_check_attributes duplicates message size and callback id checkings. nfnetlink_find_client and nfnetlink_rcv_msg already do such checkings. Signed-off-by: Pablo Neira Ayuso Index: net-2.6.git/net/netfilter/nfnetlink.c =================================================================== --- net-2.6.git.orig/net/netfilter/nfnetlink.c 2006-12-26 04:45:09.000000000 +0100 +++ net-2.6.git/net/netfilter/nfnetlink.c 2006-12-26 04:49:28.000000000 +0100 @@ -127,17 +127,10 @@ static int nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys, struct nlmsghdr *nlh, struct nfattr *cda[]) { - int min_len; + int min_len = NLMSG_SPACE(sizeof(struct nfgenmsg)); u_int16_t attr_count; u_int8_t cb_id = NFNL_MSG_TYPE(nlh->nlmsg_type); - if (unlikely(cb_id >= subsys->cb_count)) - return -EINVAL; - - min_len = NLMSG_SPACE(sizeof(struct nfgenmsg)); - if (unlikely(nlh->nlmsg_len < min_len)) - return -EINVAL; - attr_count = subsys->cb[cb_id].attr_count; memset(cda, 0, sizeof(struct nfattr *) * attr_count);