diff --git a/debian/changelog b/debian/changelog
index c303b84c5..7ec58dc6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -125,6 +125,8 @@ linux (4.13.13-1) UNRELEASED; urgency=medium
   * mac80211: use constant time comparison with keys
   * mac80211: don't compare TKIP TX MIC key in reinstall prevention
   * usb: usbtest: fix NULL pointer dereference (CVE-2017-16532)
+  * media: cx231xx-cards: fix NULL-deref on missing association descriptor
+    (CVE-2017-16536)
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 04 Nov 2017 09:54:41 +0100
 
diff --git a/debian/patches/bugfix/all/media-cx231xx-cards-fix-null-deref-on-missing-associ.patch b/debian/patches/bugfix/all/media-cx231xx-cards-fix-null-deref-on-missing-associ.patch
new file mode 100644
index 000000000..b6ad1e07d
--- /dev/null
+++ b/debian/patches/bugfix/all/media-cx231xx-cards-fix-null-deref-on-missing-associ.patch
@@ -0,0 +1,36 @@
+From: Johan Hovold <johan@kernel.org>
+Date: Thu, 21 Sep 2017 05:40:18 -0300
+Subject: [media] cx231xx-cards: fix NULL-deref on missing association
+ descriptor
+Origin: https://git.kernel.org/linus/6c3b047fa2d2286d5e438bcb470c7b1a49f415f6
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-16536
+
+Make sure to check that we actually have an Interface Association
+Descriptor before dereferencing it during probe to avoid dereferencing a
+NULL-pointer.
+
+Fixes: e0d3bafd0258 ("V4L/DVB (10954): Add cx231xx USB driver")
+
+Cc: stable <stable@vger.kernel.org>     # 2.6.30
+Reported-by: Andrey Konovalov <andreyknvl@google.com>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Tested-by: Andrey Konovalov <andreyknvl@google.com>
+Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+---
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
+index e0daa9b6c2a0..9b742d569fb5 100644
+--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
++++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
+@@ -1684,7 +1684,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
+ 	nr = dev->devno;
+ 
+ 	assoc_desc = udev->actconfig->intf_assoc[0];
+-	if (assoc_desc->bFirstInterface != ifnum) {
++	if (!assoc_desc || assoc_desc->bFirstInterface != ifnum) {
+ 		dev_err(d, "Not found matching IAD interface\n");
+ 		retval = -ENODEV;
+ 		goto err_if;
diff --git a/debian/patches/series b/debian/patches/series
index c6a86a389..56461ce42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -118,6 +118,7 @@ bugfix/all/mac80211-use-constant-time-comparison-with-keys.patch
 bugfix/all/mac80211-don-t-compare-tkip-tx-mic-key-in-reinstall-.patch
 bugfix/all/sctp-do-not-peel-off-an-assoc-from-one-netns-to-anot.patch
 bugfix/all/usb-usbtest-fix-NULL-pointer-dereference.patch
+bugfix/all/media-cx231xx-cards-fix-null-deref-on-missing-associ.patch
 
 # Fix exported symbol versions
 bugfix/alpha/alpha-restore-symbol-versions-for-symbols-exported-f.patch