From: David S. Miller Date: Tue, 6 Jul 2021 17:36:59 +0000 (-0700) Subject: Merge branch 'bonding-ipsec' X-Git-Tag: microblaze-v5.16~446^2~41 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=5ddef2ad96019d9495424c6d5139dcb5b732bd58;p=linux-2.6-microblaze.git Merge branch 'bonding-ipsec' Taehee Yoo says: ==================== net: fix bonding ipsec offload problems This series fixes some problems related to bonding ipsec offload. The 1, 5, and 8th patches are to add a missing rcu_read_lock(). The 2nd patch is to add null check code to bond_ipsec_add_sa. When bonding interface doesn't have an active real interface, the bond->curr_active_slave pointer is null. But bond_ipsec_add_sa() uses that pointer without null check. So that it results in null-ptr-deref. The 3 and 4th patches are to replace xs->xso.dev with xs->xso.real_dev. The 6th patch is to disallow to set ipsec offload if a real interface type is bonding. The 7th patch is to add struct bond_ipsec to manage SA. If bond mode is changed, or active real interface is changed, SA should be removed from old current active real interface then it should be added to new active real interface. But it can't, because it doesn't manage SA. The 9th patch is to fix incorrect return value of bond_ipsec_offload_ok(). v1 -> v2: - Add 9th patch. - Do not print warning when there is no SA in bond_ipsec_add_sa_all(). - Add comment for ipsec_lock. ==================== Signed-off-by: David S. Miller --- 5ddef2ad96019d9495424c6d5139dcb5b732bd58