diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2020-02-05 14:12:56 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2020-02-05 14:12:56 +0000 |
| commit | d79f40f7821f5a330f702a9d1b429a503af148bf (patch) | |
| tree | 7020b44756e89a9482e87c1696266964a493d935 /crypto/af_alg.c | |
| parent | bf0cb2f94cbd87e1ba1b50c693d5600f37565797 (diff) | |
| parent | d6ccbff9be43dbb6113a6a3f107c3d066052097e (diff) | |
Merge 4.4.213 into android-4.4-p
Changes in 4.4.213
ALSA: pcm: Add missing copy ops check before clearing buffer
orinoco_usb: fix interface sanity check
rsi_91x_usb: fix interface sanity check
USB: serial: ir-usb: add missing endpoint sanity check
USB: serial: ir-usb: fix link-speed handling
USB: serial: ir-usb: fix IrLAP framing
staging: most: net: fix buffer overflow
staging: wlan-ng: ensure error return is actually returned
staging: vt6656: correct packet types for CTS protect, mode.
staging: vt6656: use NULLFUCTION stack on mac80211
staging: vt6656: Fix false Tx excessive retries reporting.
ath9k: fix storage endpoint lookup
brcmfmac: fix interface sanity check
rtl8xxxu: fix interface sanity check
zd1211rw: fix storage endpoint lookup
watchdog: rn5t618_wdt: fix module aliases
drivers/net/b44: Change to non-atomic bit operations on pwol_mask
net: wan: sdla: Fix cast from pointer to integer of different size
atm: eni: fix uninitialized variable warning
usb-storage: Disable UAS on JMicron SATA enclosure
net_sched: ematch: reject invalid TCF_EM_SIMPLE
crypto: af_alg - Use bh_lock_sock in sk_destruct
vfs: fix do_last() regression
crypto: pcrypt - Fix user-after-free on module unload
arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean'
mm/mempolicy.c: fix out of bounds write in mpol_parse_str()
reiserfs: Fix memory leak of journal device string
media: digitv: don't continue if remote control state can't be read
media: gspca: zero usb_buf
media: dvb-usb/dvb-usb-urb.c: initialize actlen to 0
ttyprintk: fix a potential deadlock in interrupt context issue
usb: dwc3: turn off VBUS when leaving host mode
media: si470x-i2c: Move free() past last use of 'radio'
clk: mmp2: Fix the order of timer mux parents
ixgbevf: Remove limit of 10 entries for unicast filter list
ixgbe: Fix calculation of queue with VFs and flow director on interface flap
wireless: wext: avoid gcc -O3 warning
vti[6]: fix packet tx through bpf_redirect()
scsi: fnic: do not queue commands during fwreset
airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE
airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE
r8152: get default setting of WOL before initializing
qlcnic: Fix CPU soft lockup while collecting firmware dump
net/fsl: treat fsl,erratum-a011043
net/sonic: Add mutual exclusion for accessing shared state
net/sonic: Use MMIO accessors
net/sonic: Fix receive buffer handling
net/sonic: Quiesce SONIC before re-initializing descriptor memory
seq_tab_next() should increase position index
l2t_seq_next should increase position index
net: Fix skb->csum update in inet_proto_csum_replace16().
btrfs: fix mixed block count of available space
btrfs: do not zero f_bavail if we have available space
Linux 4.4.213
Change-Id: I73645dfdd970faeb188ee4245ad5105256cd0283
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'crypto/af_alg.c')
| -rw-r--r-- | crypto/af_alg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index b5953f1d1a18..cf3975ee4fd8 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -136,11 +136,13 @@ void af_alg_release_parent(struct sock *sk) sk = ask->parent; ask = alg_sk(sk); - lock_sock(sk); + local_bh_disable(); + bh_lock_sock(sk); ask->nokey_refcnt -= nokey; if (!last) last = !--ask->refcnt; - release_sock(sk); + bh_unlock_sock(sk); + local_bh_enable(); if (last) sock_put(sk); |