Here are some batman-adv bugfixes:
- fix skb checksum issues, by Matthias Schiffer (2 patches) - fix exception handling when dumping data objects through netlink, by Sven Eckelmann (4 patches) - fix handling of interface indices, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlqZjskWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoZgAEADcXmuvwW+QVU0L6N8ZDV7Titdp oIK+w2XDPLa2DcIkJ8ZAGJSK4ZZBrye/jAaRL/1CpBQiGDgP6pGodSihDPNUqCjs aqw8Zrwfg6BAvIeEFp3ThkCB89MADk6tMRXM4wZ3daNJvfCgHEUZeSl/1/PWWQmq yBn+DMeXZPOPJZgTTPMQUQ11kpf7UxtT4T9N8lq0KH6ISTbaZChPFlpPPIivpG+9 JLjH40v8BErpIAsZHT2LJ/JPDRPXXul61p3y2sdnVnqUuSUnsc/ElJGLARXNId8P tkKtOONlZEwnt9ZrXOLqeqxzN+KFs97JSNIuap/hRfpgbG+Qqn4pePiIQVXNHMUC eBUfbGSWNtRDX/JXcwk6O4nMkTX79UDq97npcDv5sTkWLcIeznacqpXJCA8+2E05 3F34XTDr0HY4QTxDQSEOfQ6qwo7qCxhc8u2Mr8RYNtzSiyRYS3Sy8jdFMMK/RgqT ggR8mIdR9MSRYhN0VFVHWWL7NL/OImke9ALvb4KioDbvDTFMFhsa/Pp1+K/NE3fK /E5mwicFFUB0MUmRnZiuN9gXPOy06fWOShouMgqF86Ofx4QpmT/Ph/gGK/HgFFKq SEfU6UunC3r6BISE4Zu5O7xTEH+AQhEZgyeSTTrTr+HLfNkvyqwGIlhG1HXzyCTx KWA50ikvjiKGeOCoMA== =tcl9 -----END PGP SIGNATURE----- Merge tag 'batadv-net-for-davem-20180302' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== Here are some batman-adv bugfixes: - fix skb checksum issues, by Matthias Schiffer (2 patches) - fix exception handling when dumping data objects through netlink, by Sven Eckelmann (4 patches) - fix handling of interface indices, by Sven Eckelmann ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
4e00f5d5f9
|
@ -157,7 +157,7 @@ static void batadv_iv_ogm_orig_free(struct batadv_orig_node *orig_node)
|
|||
* Return: 0 on success, a negative error code otherwise.
|
||||
*/
|
||||
static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node,
|
||||
int max_if_num)
|
||||
unsigned int max_if_num)
|
||||
{
|
||||
void *data_ptr;
|
||||
size_t old_size;
|
||||
|
@ -201,7 +201,8 @@ unlock:
|
|||
*/
|
||||
static void
|
||||
batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node,
|
||||
int max_if_num, int del_if_num)
|
||||
unsigned int max_if_num,
|
||||
unsigned int del_if_num)
|
||||
{
|
||||
size_t chunk_size;
|
||||
size_t if_offset;
|
||||
|
@ -239,7 +240,8 @@ batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node,
|
|||
*/
|
||||
static void
|
||||
batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node,
|
||||
int max_if_num, int del_if_num)
|
||||
unsigned int max_if_num,
|
||||
unsigned int del_if_num)
|
||||
{
|
||||
size_t if_offset;
|
||||
void *data_ptr;
|
||||
|
@ -276,7 +278,8 @@ batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node,
|
|||
* Return: 0 on success, a negative error code otherwise.
|
||||
*/
|
||||
static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node,
|
||||
int max_if_num, int del_if_num)
|
||||
unsigned int max_if_num,
|
||||
unsigned int del_if_num)
|
||||
{
|
||||
spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock);
|
||||
|
||||
|
@ -311,7 +314,8 @@ static struct batadv_orig_node *
|
|||
batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)
|
||||
{
|
||||
struct batadv_orig_node *orig_node;
|
||||
int size, hash_added;
|
||||
int hash_added;
|
||||
size_t size;
|
||||
|
||||
orig_node = batadv_orig_hash_find(bat_priv, addr);
|
||||
if (orig_node)
|
||||
|
@ -893,7 +897,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)
|
|||
u32 i;
|
||||
size_t word_index;
|
||||
u8 *w;
|
||||
int if_num;
|
||||
unsigned int if_num;
|
||||
|
||||
for (i = 0; i < hash->size; i++) {
|
||||
head = &hash->table[i];
|
||||
|
@ -1023,7 +1027,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
|
|||
struct batadv_neigh_node *tmp_neigh_node = NULL;
|
||||
struct batadv_neigh_node *router = NULL;
|
||||
struct batadv_orig_node *orig_node_tmp;
|
||||
int if_num;
|
||||
unsigned int if_num;
|
||||
u8 sum_orig, sum_neigh;
|
||||
u8 *neigh_addr;
|
||||
u8 tq_avg;
|
||||
|
@ -1182,7 +1186,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
|
|||
u8 total_count;
|
||||
u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;
|
||||
unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;
|
||||
int if_num;
|
||||
unsigned int if_num;
|
||||
unsigned int tq_asym_penalty, inv_asym_penalty;
|
||||
unsigned int combined_tq;
|
||||
unsigned int tq_iface_penalty;
|
||||
|
@ -1702,9 +1706,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
|
|||
|
||||
if (is_my_orig) {
|
||||
unsigned long *word;
|
||||
int offset;
|
||||
size_t offset;
|
||||
s32 bit_pos;
|
||||
s16 if_num;
|
||||
unsigned int if_num;
|
||||
u8 *weight;
|
||||
|
||||
orig_neigh_node = batadv_iv_ogm_orig_get(bat_priv,
|
||||
|
@ -2729,7 +2733,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
|
|||
struct batadv_neigh_ifinfo *router_ifinfo = NULL;
|
||||
struct batadv_neigh_node *router;
|
||||
struct batadv_gw_node *curr_gw;
|
||||
int ret = -EINVAL;
|
||||
int ret = 0;
|
||||
void *hdr;
|
||||
|
||||
router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);
|
||||
|
|
|
@ -928,7 +928,7 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
|
|||
struct batadv_neigh_ifinfo *router_ifinfo = NULL;
|
||||
struct batadv_neigh_node *router;
|
||||
struct batadv_gw_node *curr_gw;
|
||||
int ret = -EINVAL;
|
||||
int ret = 0;
|
||||
void *hdr;
|
||||
|
||||
router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);
|
||||
|
|
|
@ -2161,22 +2161,25 @@ batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,
|
|||
{
|
||||
struct batadv_bla_claim *claim;
|
||||
int idx = 0;
|
||||
int ret = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(claim, head, hash_entry) {
|
||||
if (idx++ < *idx_skip)
|
||||
continue;
|
||||
if (batadv_bla_claim_dump_entry(msg, portid, seq,
|
||||
primary_if, claim)) {
|
||||
|
||||
ret = batadv_bla_claim_dump_entry(msg, portid, seq,
|
||||
primary_if, claim);
|
||||
if (ret) {
|
||||
*idx_skip = idx - 1;
|
||||
goto unlock;
|
||||
}
|
||||
}
|
||||
|
||||
*idx_skip = idx;
|
||||
*idx_skip = 0;
|
||||
unlock:
|
||||
rcu_read_unlock();
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2391,22 +2394,25 @@ batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,
|
|||
{
|
||||
struct batadv_bla_backbone_gw *backbone_gw;
|
||||
int idx = 0;
|
||||
int ret = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) {
|
||||
if (idx++ < *idx_skip)
|
||||
continue;
|
||||
if (batadv_bla_backbone_dump_entry(msg, portid, seq,
|
||||
primary_if, backbone_gw)) {
|
||||
|
||||
ret = batadv_bla_backbone_dump_entry(msg, portid, seq,
|
||||
primary_if, backbone_gw);
|
||||
if (ret) {
|
||||
*idx_skip = idx - 1;
|
||||
goto unlock;
|
||||
}
|
||||
}
|
||||
|
||||
*idx_skip = idx;
|
||||
*idx_skip = 0;
|
||||
unlock:
|
||||
rcu_read_unlock();
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -288,7 +288,8 @@ batadv_frag_merge_packets(struct hlist_head *chain)
|
|||
/* Move the existing MAC header to just before the payload. (Override
|
||||
* the fragment header.)
|
||||
*/
|
||||
skb_pull_rcsum(skb_out, hdr_size);
|
||||
skb_pull(skb_out, hdr_size);
|
||||
skb_out->ip_summed = CHECKSUM_NONE;
|
||||
memmove(skb_out->data - ETH_HLEN, skb_mac_header(skb_out), ETH_HLEN);
|
||||
skb_set_mac_header(skb_out, -ETH_HLEN);
|
||||
skb_reset_network_header(skb_out);
|
||||
|
|
|
@ -763,6 +763,11 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
|
|||
hard_iface->soft_iface = soft_iface;
|
||||
bat_priv = netdev_priv(hard_iface->soft_iface);
|
||||
|
||||
if (bat_priv->num_ifaces >= UINT_MAX) {
|
||||
ret = -ENOSPC;
|
||||
goto err_dev;
|
||||
}
|
||||
|
||||
ret = netdev_master_upper_dev_link(hard_iface->net_dev,
|
||||
soft_iface, NULL, NULL, NULL);
|
||||
if (ret)
|
||||
|
@ -876,7 +881,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
|
|||
batadv_hardif_recalc_extra_skbroom(hard_iface->soft_iface);
|
||||
|
||||
/* nobody uses this interface anymore */
|
||||
if (!bat_priv->num_ifaces) {
|
||||
if (bat_priv->num_ifaces == 0) {
|
||||
batadv_gw_check_client_stop(bat_priv);
|
||||
|
||||
if (autodel == BATADV_IF_CLEANUP_AUTO)
|
||||
|
@ -912,7 +917,7 @@ batadv_hardif_add_interface(struct net_device *net_dev)
|
|||
if (ret)
|
||||
goto free_if;
|
||||
|
||||
hard_iface->if_num = -1;
|
||||
hard_iface->if_num = 0;
|
||||
hard_iface->net_dev = net_dev;
|
||||
hard_iface->soft_iface = NULL;
|
||||
hard_iface->if_status = BATADV_IF_NOT_IN_USE;
|
||||
|
|
|
@ -1569,7 +1569,7 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb)
|
|||
* Return: 0 on success or negative error number in case of failure
|
||||
*/
|
||||
int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,
|
||||
int max_if_num)
|
||||
unsigned int max_if_num)
|
||||
{
|
||||
struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
|
||||
struct batadv_algo_ops *bao = bat_priv->algo_ops;
|
||||
|
@ -1611,7 +1611,7 @@ err:
|
|||
* Return: 0 on success or negative error number in case of failure
|
||||
*/
|
||||
int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,
|
||||
int max_if_num)
|
||||
unsigned int max_if_num)
|
||||
{
|
||||
struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
|
||||
struct batadv_hashtable *hash = bat_priv->orig_hash;
|
||||
|
|
|
@ -73,9 +73,9 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset);
|
|||
int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb);
|
||||
int batadv_orig_hardif_seq_print_text(struct seq_file *seq, void *offset);
|
||||
int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,
|
||||
int max_if_num);
|
||||
unsigned int max_if_num);
|
||||
int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,
|
||||
int max_if_num);
|
||||
unsigned int max_if_num);
|
||||
struct batadv_orig_node_vlan *
|
||||
batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node,
|
||||
unsigned short vid);
|
||||
|
|
|
@ -459,13 +459,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
|
|||
|
||||
/* skb->dev & skb->pkt_type are set here */
|
||||
skb->protocol = eth_type_trans(skb, soft_iface);
|
||||
|
||||
/* should not be necessary anymore as we use skb_pull_rcsum()
|
||||
* TODO: please verify this and remove this TODO
|
||||
* -- Dec 21st 2009, Simon Wunderlich
|
||||
*/
|
||||
|
||||
/* skb->ip_summed = CHECKSUM_UNNECESSARY; */
|
||||
skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
|
||||
|
||||
batadv_inc_counter(bat_priv, BATADV_CNT_RX);
|
||||
batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
|
||||
|
|
|
@ -167,7 +167,7 @@ struct batadv_hard_iface {
|
|||
struct list_head list;
|
||||
|
||||
/** @if_num: identificator of the interface */
|
||||
s16 if_num;
|
||||
unsigned int if_num;
|
||||
|
||||
/** @if_status: status of the interface for batman-adv */
|
||||
char if_status;
|
||||
|
@ -1596,7 +1596,7 @@ struct batadv_priv {
|
|||
atomic_t batman_queue_left;
|
||||
|
||||
/** @num_ifaces: number of interfaces assigned to this mesh interface */
|
||||
char num_ifaces;
|
||||
unsigned int num_ifaces;
|
||||
|
||||
/** @mesh_obj: kobject for sysfs mesh subdirectory */
|
||||
struct kobject *mesh_obj;
|
||||
|
@ -2186,15 +2186,16 @@ struct batadv_algo_orig_ops {
|
|||
* orig_node due to a new hard-interface being added into the mesh
|
||||
* (optional)
|
||||
*/
|
||||
int (*add_if)(struct batadv_orig_node *orig_node, int max_if_num);
|
||||
int (*add_if)(struct batadv_orig_node *orig_node,
|
||||
unsigned int max_if_num);
|
||||
|
||||
/**
|
||||
* @del_if: ask the routing algorithm to apply the needed changes to the
|
||||
* orig_node due to an hard-interface being removed from the mesh
|
||||
* (optional)
|
||||
*/
|
||||
int (*del_if)(struct batadv_orig_node *orig_node, int max_if_num,
|
||||
int del_if_num);
|
||||
int (*del_if)(struct batadv_orig_node *orig_node,
|
||||
unsigned int max_if_num, unsigned int del_if_num);
|
||||
|
||||
#ifdef CONFIG_BATMAN_ADV_DEBUGFS
|
||||
/** @print: print the originator table (optional) */
|
||||
|
|
Loading…
Reference in a new issue