From: Greg Kroah-Hartman Date: Fri, 25 Feb 2022 12:00:37 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.9.304~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c4c650f430402d2953c2c717c79f16d94454e5d;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: cdc-ncm-avoid-overflow-in-sanity-checking.patch drm-amdgpu-check-vm-ready-by-amdgpu_vm-evicting-flag.patch drm-amdgpu-disable-mmhub-pg-for-picasso.patch drm-i915-correctly-populate-use_sagv_wm-for-all-pipes.patch netfilter-nf_tables_offload-incorrect-flow-offload-action-array-size.patch sr9700-sanity-check-for-packet-length.patch usb-zaurus-support-another-broken-zaurus.patch --- diff --git a/queue-5.10/cdc-ncm-avoid-overflow-in-sanity-checking.patch b/queue-5.10/cdc-ncm-avoid-overflow-in-sanity-checking.patch new file mode 100644 index 00000000000..7952a19ef65 --- /dev/null +++ b/queue-5.10/cdc-ncm-avoid-overflow-in-sanity-checking.patch @@ -0,0 +1,51 @@ +From 8d2b1a1ec9f559d30b724877da4ce592edc41fdc Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Tue, 15 Feb 2022 11:35:47 +0100 +Subject: CDC-NCM: avoid overflow in sanity checking + +From: Oliver Neukum + +commit 8d2b1a1ec9f559d30b724877da4ce592edc41fdc upstream. + +A broken device may give an extreme offset like 0xFFF0 +and a reasonable length for a fragment. In the sanity +check as formulated now, this will create an integer +overflow, defeating the sanity check. Both offset +and offset + len need to be checked in such a manner +that no overflow can occur. +And those quantities should be unsigned. + +Signed-off-by: Oliver Neukum +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/cdc_ncm.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/net/usb/cdc_ncm.c ++++ b/drivers/net/usb/cdc_ncm.c +@@ -1702,10 +1702,10 @@ int cdc_ncm_rx_fixup(struct usbnet *dev, + { + struct sk_buff *skb; + struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0]; +- int len; ++ unsigned int len; + int nframes; + int x; +- int offset; ++ unsigned int offset; + union { + struct usb_cdc_ncm_ndp16 *ndp16; + struct usb_cdc_ncm_ndp32 *ndp32; +@@ -1777,8 +1777,8 @@ next_ndp: + break; + } + +- /* sanity checking */ +- if (((offset + len) > skb_in->len) || ++ /* sanity checking - watch out for integer wrap*/ ++ if ((offset > skb_in->len) || (len > skb_in->len - offset) || + (len > ctx->rx_max) || (len < ETH_HLEN)) { + netif_dbg(dev, rx_err, dev->net, + "invalid frame detected (ignored) offset[%u]=%u, length=%u, skb=%p\n", diff --git a/queue-5.10/drm-amdgpu-check-vm-ready-by-amdgpu_vm-evicting-flag.patch b/queue-5.10/drm-amdgpu-check-vm-ready-by-amdgpu_vm-evicting-flag.patch new file mode 100644 index 00000000000..cf344553272 --- /dev/null +++ b/queue-5.10/drm-amdgpu-check-vm-ready-by-amdgpu_vm-evicting-flag.patch @@ -0,0 +1,78 @@ +From c1a66c3bc425ff93774fb2f6eefa67b83170dd7e Mon Sep 17 00:00:00 2001 +From: Qiang Yu +Date: Mon, 21 Feb 2022 17:53:56 +0800 +Subject: drm/amdgpu: check vm ready by amdgpu_vm->evicting flag +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Qiang Yu + +commit c1a66c3bc425ff93774fb2f6eefa67b83170dd7e upstream. + +Workstation application ANSA/META v21.1.4 get this error dmesg when +running CI test suite provided by ANSA/META: +[drm:amdgpu_gem_va_ioctl [amdgpu]] *ERROR* Couldn't update BO_VA (-16) + +This is caused by: +1. create a 256MB buffer in invisible VRAM +2. CPU map the buffer and access it causes vm_fault and try to move + it to visible VRAM +3. force visible VRAM space and traverse all VRAM bos to check if + evicting this bo is valuable +4. when checking a VM bo (in invisible VRAM), amdgpu_vm_evictable() + will set amdgpu_vm->evicting, but latter due to not in visible + VRAM, won't really evict it so not add it to amdgpu_vm->evicted +5. before next CS to clear the amdgpu_vm->evicting, user VM ops + ioctl will pass amdgpu_vm_ready() (check amdgpu_vm->evicted) + but fail in amdgpu_vm_bo_update_mapping() (check + amdgpu_vm->evicting) and get this error log + +This error won't affect functionality as next CS will finish the +waiting VM ops. But we'd better clear the error log by checking +the amdgpu_vm->evicting flag in amdgpu_vm_ready() to stop calling +amdgpu_vm_bo_update_mapping() later. + +Another reason is amdgpu_vm->evicted list holds all BOs (both +user buffer and page table), but only page table BOs' eviction +prevent VM ops. amdgpu_vm->evicting flag is set only for page +table BOs, so we should use evicting flag instead of evicted list +in amdgpu_vm_ready(). + +The side effect of this change is: previously blocked VM op (user +buffer in "evicted" list but no page table in it) gets done +immediately. + +v2: update commit comments. + +Acked-by: Paul Menzel +Reviewed-by: Christian König +Signed-off-by: Qiang Yu +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -715,11 +715,16 @@ int amdgpu_vm_validate_pt_bos(struct amd + * Check if all VM PDs/PTs are ready for updates + * + * Returns: +- * True if eviction list is empty. ++ * True if VM is not evicting. + */ + bool amdgpu_vm_ready(struct amdgpu_vm *vm) + { +- return list_empty(&vm->evicted); ++ bool ret; ++ ++ amdgpu_vm_eviction_lock(vm); ++ ret = !vm->evicting; ++ amdgpu_vm_eviction_unlock(vm); ++ return ret; + } + + /** diff --git a/queue-5.10/drm-amdgpu-disable-mmhub-pg-for-picasso.patch b/queue-5.10/drm-amdgpu-disable-mmhub-pg-for-picasso.patch new file mode 100644 index 00000000000..37e561b232b --- /dev/null +++ b/queue-5.10/drm-amdgpu-disable-mmhub-pg-for-picasso.patch @@ -0,0 +1,35 @@ +From f626dd0ff05043e5a7154770cc7cda66acee33a3 Mon Sep 17 00:00:00 2001 +From: Evan Quan +Date: Thu, 20 Jan 2022 16:15:52 +0800 +Subject: drm/amdgpu: disable MMHUB PG for Picasso + +From: Evan Quan + +commit f626dd0ff05043e5a7154770cc7cda66acee33a3 upstream. + +MMHUB PG needs to be disabled for Picasso for stability reasons. + +Signed-off-by: Evan Quan +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/amdgpu/soc15.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c +@@ -1194,8 +1194,11 @@ static int soc15_common_early_init(void + AMD_CG_SUPPORT_SDMA_MGCG | + AMD_CG_SUPPORT_SDMA_LS; + ++ /* ++ * MMHUB PG needs to be disabled for Picasso for ++ * stability reasons. ++ */ + adev->pg_flags = AMD_PG_SUPPORT_SDMA | +- AMD_PG_SUPPORT_MMHUB | + AMD_PG_SUPPORT_VCN; + } else { + adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG | diff --git a/queue-5.10/drm-i915-correctly-populate-use_sagv_wm-for-all-pipes.patch b/queue-5.10/drm-i915-correctly-populate-use_sagv_wm-for-all-pipes.patch new file mode 100644 index 00000000000..69deda7981a --- /dev/null +++ b/queue-5.10/drm-i915-correctly-populate-use_sagv_wm-for-all-pipes.patch @@ -0,0 +1,69 @@ +From afc189df6bcc6be65961deb54e15ec60e7f85337 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= +Date: Fri, 18 Feb 2022 08:40:34 +0200 +Subject: drm/i915: Correctly populate use_sagv_wm for all pipes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ville Syrjälä + +commit afc189df6bcc6be65961deb54e15ec60e7f85337 upstream. + +When changing between SAGV vs. no SAGV on tgl+ we have to +update the use_sagv_wm flag for all the crtcs or else +an active pipe not already in the state will end up using +the wrong watermarks. That is especially bad when we end up +with the tighter non-SAGV watermarks with SAGV enabled. +Usually ends up in underruns. + +Cc: stable@vger.kernel.org +Reviewed-by: Stanislav Lisovskiy +Fixes: 7241c57d3140 ("drm/i915: Add TGL+ SAGV support") +Signed-off-by: Ville Syrjälä +Link: https://patchwork.freedesktop.org/patch/msgid/20220218064039.12834-2-ville.syrjala@linux.intel.com +(cherry picked from commit 8dd8ffb824ca7b897ce9f2082ffa7e64831c22dc) +Signed-off-by: Tvrtko Ursulin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/i915/intel_pm.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +--- a/drivers/gpu/drm/i915/intel_pm.c ++++ b/drivers/gpu/drm/i915/intel_pm.c +@@ -3996,6 +3996,17 @@ static int intel_compute_sagv_mask(struc + return ret; + } + ++ if (intel_can_enable_sagv(dev_priv, new_bw_state) != ++ intel_can_enable_sagv(dev_priv, old_bw_state)) { ++ ret = intel_atomic_serialize_global_state(&new_bw_state->base); ++ if (ret) ++ return ret; ++ } else if (new_bw_state->pipe_sagv_reject != old_bw_state->pipe_sagv_reject) { ++ ret = intel_atomic_lock_global_state(&new_bw_state->base); ++ if (ret) ++ return ret; ++ } ++ + for_each_new_intel_crtc_in_state(state, crtc, + new_crtc_state, i) { + struct skl_pipe_wm *pipe_wm = &new_crtc_state->wm.skl.optimal; +@@ -4010,17 +4021,6 @@ static int intel_compute_sagv_mask(struc + intel_can_enable_sagv(dev_priv, new_bw_state); + } + +- if (intel_can_enable_sagv(dev_priv, new_bw_state) != +- intel_can_enable_sagv(dev_priv, old_bw_state)) { +- ret = intel_atomic_serialize_global_state(&new_bw_state->base); +- if (ret) +- return ret; +- } else if (new_bw_state->pipe_sagv_reject != old_bw_state->pipe_sagv_reject) { +- ret = intel_atomic_lock_global_state(&new_bw_state->base); +- if (ret) +- return ret; +- } +- + return 0; + } + diff --git a/queue-5.10/netfilter-nf_tables_offload-incorrect-flow-offload-action-array-size.patch b/queue-5.10/netfilter-nf_tables_offload-incorrect-flow-offload-action-array-size.patch new file mode 100644 index 00000000000..3433c225fcd --- /dev/null +++ b/queue-5.10/netfilter-nf_tables_offload-incorrect-flow-offload-action-array-size.patch @@ -0,0 +1,136 @@ +From b1a5983f56e371046dcf164f90bfaf704d2b89f6 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Thu, 17 Feb 2022 23:41:20 +0100 +Subject: netfilter: nf_tables_offload: incorrect flow offload action array size + +From: Pablo Neira Ayuso + +commit b1a5983f56e371046dcf164f90bfaf704d2b89f6 upstream. + +immediate verdict expression needs to allocate one slot in the flow offload +action array, however, immediate data expression does not need to do so. + +fwd and dup expression need to allocate one slot, this is missing. + +Add a new offload_action interface to report if this expression needs to +allocate one slot in the flow offload action array. + +Fixes: be2861dc36d7 ("netfilter: nft_{fwd,dup}_netdev: add offload support") +Reported-and-tested-by: Nick Gregory +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman +--- + include/net/netfilter/nf_tables.h | 2 +- + include/net/netfilter/nf_tables_offload.h | 2 -- + net/netfilter/nf_tables_offload.c | 3 ++- + net/netfilter/nft_dup_netdev.c | 6 ++++++ + net/netfilter/nft_fwd_netdev.c | 6 ++++++ + net/netfilter/nft_immediate.c | 12 +++++++++++- + 6 files changed, 26 insertions(+), 5 deletions(-) + +--- a/include/net/netfilter/nf_tables.h ++++ b/include/net/netfilter/nf_tables.h +@@ -825,7 +825,7 @@ struct nft_expr_ops { + int (*offload)(struct nft_offload_ctx *ctx, + struct nft_flow_rule *flow, + const struct nft_expr *expr); +- u32 offload_flags; ++ bool (*offload_action)(const struct nft_expr *expr); + const struct nft_expr_type *type; + void *data; + }; +--- a/include/net/netfilter/nf_tables_offload.h ++++ b/include/net/netfilter/nf_tables_offload.h +@@ -67,8 +67,6 @@ struct nft_flow_rule { + struct flow_rule *rule; + }; + +-#define NFT_OFFLOAD_F_ACTION (1 << 0) +- + void nft_flow_rule_set_addr_type(struct nft_flow_rule *flow, + enum flow_dissector_key_id addr_type); + +--- a/net/netfilter/nf_tables_offload.c ++++ b/net/netfilter/nf_tables_offload.c +@@ -94,7 +94,8 @@ struct nft_flow_rule *nft_flow_rule_crea + + expr = nft_expr_first(rule); + while (nft_expr_more(rule, expr)) { +- if (expr->ops->offload_flags & NFT_OFFLOAD_F_ACTION) ++ if (expr->ops->offload_action && ++ expr->ops->offload_action(expr)) + num_actions++; + + expr = nft_expr_next(expr); +--- a/net/netfilter/nft_dup_netdev.c ++++ b/net/netfilter/nft_dup_netdev.c +@@ -67,6 +67,11 @@ static int nft_dup_netdev_offload(struct + return nft_fwd_dup_netdev_offload(ctx, flow, FLOW_ACTION_MIRRED, oif); + } + ++static bool nft_dup_netdev_offload_action(const struct nft_expr *expr) ++{ ++ return true; ++} ++ + static struct nft_expr_type nft_dup_netdev_type; + static const struct nft_expr_ops nft_dup_netdev_ops = { + .type = &nft_dup_netdev_type, +@@ -75,6 +80,7 @@ static const struct nft_expr_ops nft_dup + .init = nft_dup_netdev_init, + .dump = nft_dup_netdev_dump, + .offload = nft_dup_netdev_offload, ++ .offload_action = nft_dup_netdev_offload_action, + }; + + static struct nft_expr_type nft_dup_netdev_type __read_mostly = { +--- a/net/netfilter/nft_fwd_netdev.c ++++ b/net/netfilter/nft_fwd_netdev.c +@@ -77,6 +77,11 @@ static int nft_fwd_netdev_offload(struct + return nft_fwd_dup_netdev_offload(ctx, flow, FLOW_ACTION_REDIRECT, oif); + } + ++static bool nft_fwd_netdev_offload_action(const struct nft_expr *expr) ++{ ++ return true; ++} ++ + struct nft_fwd_neigh { + enum nft_registers sreg_dev:8; + enum nft_registers sreg_addr:8; +@@ -219,6 +224,7 @@ static const struct nft_expr_ops nft_fwd + .dump = nft_fwd_netdev_dump, + .validate = nft_fwd_validate, + .offload = nft_fwd_netdev_offload, ++ .offload_action = nft_fwd_netdev_offload_action, + }; + + static const struct nft_expr_ops * +--- a/net/netfilter/nft_immediate.c ++++ b/net/netfilter/nft_immediate.c +@@ -213,6 +213,16 @@ static int nft_immediate_offload(struct + return 0; + } + ++static bool nft_immediate_offload_action(const struct nft_expr *expr) ++{ ++ const struct nft_immediate_expr *priv = nft_expr_priv(expr); ++ ++ if (priv->dreg == NFT_REG_VERDICT) ++ return true; ++ ++ return false; ++} ++ + static const struct nft_expr_ops nft_imm_ops = { + .type = &nft_imm_type, + .size = NFT_EXPR_SIZE(sizeof(struct nft_immediate_expr)), +@@ -224,7 +234,7 @@ static const struct nft_expr_ops nft_imm + .dump = nft_immediate_dump, + .validate = nft_immediate_validate, + .offload = nft_immediate_offload, +- .offload_flags = NFT_OFFLOAD_F_ACTION, ++ .offload_action = nft_immediate_offload_action, + }; + + struct nft_expr_type nft_imm_type __read_mostly = { diff --git a/queue-5.10/series b/queue-5.10/series index 4849109ff71..3d9fd870ca1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -6,3 +6,10 @@ vhost-vsock-don-t-check-owner-in-vhost_vsock_stop-while-releasing.patch parisc-unaligned-fix-fldd-and-fstd-unaligned-handlers-on-32-bit-kernel.patch parisc-unaligned-fix-ldw-and-stw-unalignment-handlers.patch kvm-x86-mmu-make-apf-token-non-zero-to-fix-bug.patch +drm-amdgpu-disable-mmhub-pg-for-picasso.patch +drm-amdgpu-check-vm-ready-by-amdgpu_vm-evicting-flag.patch +drm-i915-correctly-populate-use_sagv_wm-for-all-pipes.patch +sr9700-sanity-check-for-packet-length.patch +usb-zaurus-support-another-broken-zaurus.patch +cdc-ncm-avoid-overflow-in-sanity-checking.patch +netfilter-nf_tables_offload-incorrect-flow-offload-action-array-size.patch diff --git a/queue-5.10/sr9700-sanity-check-for-packet-length.patch b/queue-5.10/sr9700-sanity-check-for-packet-length.patch new file mode 100644 index 00000000000..a81b362b525 --- /dev/null +++ b/queue-5.10/sr9700-sanity-check-for-packet-length.patch @@ -0,0 +1,31 @@ +From e9da0b56fe27206b49f39805f7dcda8a89379062 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Thu, 17 Feb 2022 14:10:44 +0100 +Subject: sr9700: sanity check for packet length + +From: Oliver Neukum + +commit e9da0b56fe27206b49f39805f7dcda8a89379062 upstream. + +A malicious device can leak heap data to user space +providing bogus frame lengths. Introduce a sanity check. + +Signed-off-by: Oliver Neukum +Reviewed-by: Grant Grundler +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/sr9700.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/usb/sr9700.c ++++ b/drivers/net/usb/sr9700.c +@@ -410,7 +410,7 @@ static int sr9700_rx_fixup(struct usbnet + /* ignore the CRC length */ + len = (skb->data[1] | (skb->data[2] << 8)) - 4; + +- if (len > ETH_FRAME_LEN) ++ if (len > ETH_FRAME_LEN || len > skb->len) + return 0; + + /* the last packet of current skb */ diff --git a/queue-5.10/usb-zaurus-support-another-broken-zaurus.patch b/queue-5.10/usb-zaurus-support-another-broken-zaurus.patch new file mode 100644 index 00000000000..2e57f75c6d4 --- /dev/null +++ b/queue-5.10/usb-zaurus-support-another-broken-zaurus.patch @@ -0,0 +1,79 @@ +From 6605cc67ca18b9d583eb96e18a20f5f4e726103c Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Mon, 14 Feb 2022 15:08:18 +0100 +Subject: USB: zaurus: support another broken Zaurus + +From: Oliver Neukum + +commit 6605cc67ca18b9d583eb96e18a20f5f4e726103c upstream. + +This SL-6000 says Direct Line, not Ethernet + +v2: added Reporter and Link + +Signed-off-by: Oliver Neukum +Reported-by: Ross Maynard +Link: https://bugzilla.kernel.org/show_bug.cgi?id=215361 +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/cdc_ether.c | 12 ++++++++++++ + drivers/net/usb/zaurus.c | 12 ++++++++++++ + 2 files changed, 24 insertions(+) + +--- a/drivers/net/usb/cdc_ether.c ++++ b/drivers/net/usb/cdc_ether.c +@@ -570,6 +570,11 @@ static const struct usb_device_id produc + .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \ + .bInterfaceProtocol = USB_CDC_PROTO_NONE + ++#define ZAURUS_FAKE_INTERFACE \ ++ .bInterfaceClass = USB_CLASS_COMM, \ ++ .bInterfaceSubClass = USB_CDC_SUBCLASS_MDLM, \ ++ .bInterfaceProtocol = USB_CDC_PROTO_NONE ++ + /* SA-1100 based Sharp Zaurus ("collie"), or compatible; + * wire-incompatible with true CDC Ethernet implementations. + * (And, it seems, needlessly so...) +@@ -625,6 +630,13 @@ static const struct usb_device_id produc + .driver_info = 0, + }, { + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO ++ | USB_DEVICE_ID_MATCH_DEVICE, ++ .idVendor = 0x04DD, ++ .idProduct = 0x9032, /* SL-6000 */ ++ ZAURUS_FAKE_INTERFACE, ++ .driver_info = 0, ++}, { ++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO + | USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x04DD, + /* reported with some C860 units */ +--- a/drivers/net/usb/zaurus.c ++++ b/drivers/net/usb/zaurus.c +@@ -256,6 +256,11 @@ static const struct usb_device_id produc + .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \ + .bInterfaceProtocol = USB_CDC_PROTO_NONE + ++#define ZAURUS_FAKE_INTERFACE \ ++ .bInterfaceClass = USB_CLASS_COMM, \ ++ .bInterfaceSubClass = USB_CDC_SUBCLASS_MDLM, \ ++ .bInterfaceProtocol = USB_CDC_PROTO_NONE ++ + /* SA-1100 based Sharp Zaurus ("collie"), or compatible. */ + { + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO +@@ -315,6 +320,13 @@ static const struct usb_device_id produc + .driver_info = ZAURUS_PXA_INFO, + }, { + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO ++ | USB_DEVICE_ID_MATCH_DEVICE, ++ .idVendor = 0x04DD, ++ .idProduct = 0x9032, /* SL-6000 */ ++ ZAURUS_FAKE_INTERFACE, ++ .driver_info = (unsigned long)&bogus_mdlm_info, ++}, { ++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO + | USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x04DD, + /* reported with some C860 units */