diff options
| author | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
| commit | 12456e509be25d24fe479394852428517922d02a (patch) | |
| tree | 8b1e8e1025ce1beb350bbf977ac8b8ffdd5fbfa1 /net/dccp/feat.c | |
| parent | Merge tag 'usb-serial-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Linux 5.1-rc7 (diff) | |
| download | kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.gz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.xz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.zip | |
Merge 5.1-rc7 into usb-next
We need this to make the usb-gadget branch merge cleaner. And for
testing to keep from hitting the same issues already fixed.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/dccp/feat.c')
| -rw-r--r-- | net/dccp/feat.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/dccp/feat.c b/net/dccp/feat.c index f227f002c73d..db87d9f58019 100644 --- a/net/dccp/feat.c +++ b/net/dccp/feat.c @@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local, if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len)) return -ENOMEM; - return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval); + if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) { + kfree(fval.sp.vec); + return -ENOMEM; + } + + return 0; } /** |