Commit 3cf4375a authored by Xin Long's avatar Xin Long Committed by David S. Miller

tipc: do not write skb_shinfo frags when doing decrytion

One skb's skb_shinfo frags are not writable, and they can be shared with
other skbs' like by pskb_copy(). To write the frags may cause other skb's
data crash.

So before doing en/decryption, skb_cow_data() should always be called for
a cloned or nonlinear skb if req dst is using the same sg as req src.
While at it, the likely branch can be removed, as it will be covered
by skb_cow_data().

Note that esp_input() has the same issue, and I will fix it in another
patch. tipc_aead_encrypt() doesn't have this issue, as it only processes
linear data in the unlikely branch.

Fixes: fc1b6d6d ("tipc: introduce TIPC encryption & authentication")
Reported-by: default avatarShuang Li <shuali@redhat.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarJon Maloy <jmaloy@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e394f1e3
...@@ -898,17 +898,11 @@ static int tipc_aead_decrypt(struct net *net, struct tipc_aead *aead, ...@@ -898,17 +898,11 @@ static int tipc_aead_decrypt(struct net *net, struct tipc_aead *aead,
if (unlikely(!aead)) if (unlikely(!aead))
return -ENOKEY; return -ENOKEY;
/* Cow skb data if needed */
if (likely(!skb_cloned(skb) &&
(!skb_is_nonlinear(skb) || !skb_has_frag_list(skb)))) {
nsg = 1 + skb_shinfo(skb)->nr_frags;
} else {
nsg = skb_cow_data(skb, 0, &unused); nsg = skb_cow_data(skb, 0, &unused);
if (unlikely(nsg < 0)) { if (unlikely(nsg < 0)) {
pr_err("RX: skb_cow_data() returned %d\n", nsg); pr_err("RX: skb_cow_data() returned %d\n", nsg);
return nsg; return nsg;
} }
}
/* Allocate memory for the AEAD operation */ /* Allocate memory for the AEAD operation */
tfm = tipc_aead_tfm_next(aead); tfm = tipc_aead_tfm_next(aead);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment