Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc0c7eb authored by Linus Lüssing's avatar Linus Lüssing Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: Fix aggregation direct-link bug 



So far, neighbour's secondary interface OGMs can involuntarily
piggyback on primary interface OGMs that arrived on the same secondary
interface before. Secondary interface OGMs should NEVER leave their
direct neighbour broadcast domain! This patch ensures that secondary
interface OGMs can only be aggregated to other secondary interface OGMs.

Signed-off-by: default avatarLinus Lüssing <linus.luessing@web.de>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bd13b616

drivers/staging/batman-adv/aggregation.c

+9 −3
Original line number Diff line number Diff line
@@ -81,9 +81,15 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, 
		 * interface only - we still can aggregate */

		if ((directlink) &&

		    (new_batman_packet->ttl == 1) &&

		    (forw_packet->if_incoming == if_incoming))

		    (forw_packet->if_incoming == if_incoming) &&



		    /* packets from direct neighbors or

		     * own secondary interface packets

		     * (= secondary interface packets in general) */

		    (batman_packet->flags & DIRECTLINK ||

		     (forw_packet->own &&

		      forw_packet->if_incoming->if_num != 0)))

			return true;



	}



	return false;
@@ -204,7 +210,7 @@ void add_bat_packet_to_list(unsigned char *packet_buff, int packet_len, 
		 * later on

		 */

		if ((!own_packet) &&

		    (atomic_read(&bat_priv->aggregation_enabled)))

		    (atomic_read(&aggregation_enabled)))

			send_time += msecs_to_jiffies(MAX_AGGREGATION_MS);



		new_aggregated_packet(packet_buff, packet_len,