Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1358614 > unrolled thread
| Started by | lizf@kernel.org |
|---|---|
| First post | 2016-03-16 09:10 +0100 |
| Last post | 2016-03-17 02:30 +0100 |
| Articles | 5 on this page of 105 — 4 participants |
Back to article view | Back to linux.kernel
[PATCH 3.4 000/107] 3.4.111-rc1 review lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 005/107] ext4: replace open coded nofail allocation in ext4_free_blocks() lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 012/107] dm thin: allocate the cell_sort_array dynamically lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 001/107] Btrfs: use kmem_cache_free when freeing entry in inode cache lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 026/107] libata: add ATA_HORKAGE_NOTRIM lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 017/107] drm: add a check for x/y in drm_mode_setcrtc lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 040/107] xhci: prevent bus_suspend if SS port resuming in phase 1 lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 020/107] net: call rcu_read_lock early in process_backlog lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 015/107] dm btree: silence lockdep lock inversion in dm_btree_del() lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 029/107] net: Clone skb before setting peeked flag lizf@kernel.org - 2016-03-16 09:10 +0100
[PATCH 3.4 089/107] KVM: svm: unconditionally intercept #DB lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 082/107] isdn_ppp: Add checks for allocation failure in isdn_ppp_open() lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 098/107] kernel/watchdog.c: touch_nmi_watchdog should only touch local cpu not every one lizf@kernel.org - 2016-03-16 09:20 +0100
Re: [PATCH 3.4 098/107] kernel/watchdog.c: touch_nmi_watchdog should only touch local cpu not every one Don Zickus <dzickus@redhat.com> - 2016-03-16 15:20 +0100
Re: [PATCH 3.4 098/107] kernel/watchdog.c: touch_nmi_watchdog should only touch local cpu not every one Zefan Li <lizefan@huawei.com> - 2016-03-17 02:30 +0100
[PATCH 3.4 102/107] ALSA: tlv: compute TLV_*_ITEM lengths automatically lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 053/107] drm/radeon/combios: add some validation of lvds values lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 073/107] sctp: donot reset the overall_error_count in SHUTDOWN_RECEIVE state lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 055/107] x86/xen: Probe target addresses in set_aliased_prot() before the hypercall lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 095/107] atm: deal with setting entry before mkip was called lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 090/107] get rid of s_files and files_lock lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 105/107] usb: dwc3: Fix assignment of EP transfer resources lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 067/107] dm btree: add ref counting ops for the leaves of top level btrees lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 100/107] af_unix: Guard against other == sk in unix_dgram_sendmsg lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 093/107] ipv6: probe routes asynchronous in rt6_probe lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 054/107] target/iscsi: Fix double free of a TUR followed by a solicited NOPOUT lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 096/107] SUNRPC: never enqueue a ->rq_cong request on ->sending lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 066/107] localmodconfig: Use Kbuild files too lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 059/107] xhci: fix off by one error in TRB DMA address boundary check lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 097/107] ipv6: prevent fib6_run_gc() contention lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 088/107] KVM: x86: work around infinite loop in microcode when #AC is delivered lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 107/107] KVM: x86: move steal time initialization to vcpu entry time lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 099/107] net: fix warnings in 'make htmldocs' by moving macro definition out of field declaration lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 104/107] ALSA: usb-audio: Add a more accurate volume quirk for AudioQuest DragonFly lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 103/107] ALSA: tlv: add DECLARE_TLV_DB_RANGE() lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 106/107] dm btree remove: fix a bug when rebalancing nodes after removal lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 075/107] unix: avoid use-after-free in ep_remove_wait_queue lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 087/107] ipv6: addrconf: validate new MTU before applying it lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 094/107] netfilter: nf_conntrack: fix RCU race in nf_conntrack_find_get lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 048/107] iscsi-target: Fix use-after-free during TPG session shutdown lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 083/107] ppp, slip: Validate VJ compression slot parameters completely lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 091/107] Initialize msg/shm IPC objects before doing ipc_addid() lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 101/107] x86/LDT: Print the real LDT base address lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 086/107] KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 092/107] net: avoid to hang up on sending due to sysctl configuration overflow. lizf@kernel.org - 2016-03-16 09:20 +0100
[PATCH 3.4 060/107] rds: fix an integer overflow test in rds_info_getsockopt() lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 081/107] virtio-net: drop NETIF_F_FRAGLIST lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 078/107] RDS: verify the underlying transport exists before creating a connection lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 063/107] ocfs2: fix BUG in ocfs2_downconvert_thread_do_work() lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 077/107] net: add validation for the socket syscall protocol argument lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 072/107] net: Fix RCU splat in af_key lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 076/107] pptp: verify sockaddr_len in pptp_bind() and pptp_connect() lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 058/107] MIPS: Fix sched_getaffinity with MT FPAFF enabled lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 080/107] sg_start_req(): make sure that there's not too many elements in iovec lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 074/107] Revert "usb: dwc3: Reset the transfer resource index on SET_INTERFACE" lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 061/107] perf: Fix fasync handling on inherited events lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 056/107] x86/ldt: Make modify_ldt synchronous lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 064/107] x86/ldt: Correct LDT access in single stepping logic lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 085/107] KEYS: Fix race between key destruction and finding a keyring by name lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 062/107] MIPS: Make set_pte() SMP safe. lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 071/107] ipc,sem: fix use after free on IPC_RMID after a task using same semaphore set exits lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 065/107] x86/ldt: Correct FPU emulation access to LDT lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 070/107] EDAC, ppc4xx: Access mci->csrows array elements properly lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 084/107] USB: whiteheat: fix potential null-deref at probe lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 068/107] libiscsi: Fix host busy blocking during connection teardown lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 069/107] libfc: Fix fc_fcp_cleanup_each_cmd() lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 079/107] RDS: fix race condition when sending a message on unbound socket lizf@kernel.org - 2016-03-16 09:30 +0100
[PATCH 3.4 036/107] usb: dwc3: Reset the transfer resource index on SET_INTERFACE lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 037/107] usb: xhci: Bugfix for NULL pointer deference in xhci_endpoint_init() function lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 049/107] niu: don't count tx error twice in case of headroom realloc fails lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 031/107] can: mcp251x: fix resume when device is down lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 051/107] USB: sierra: add 1199:68AB device ID lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 050/107] vhost: actually track log eventfd file lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 052/107] ALSA: usb-audio: add dB range mapping for some devices lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 034/107] md: make sure everything is freed when dm-raid stops an array. lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 046/107] netfilter: nf_conntrack: Support expectations in different zones lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 057/107] md/raid1: extend spinlock to protect raid1_end_read_request against inconsistencies lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 024/107] ata: pmp: add quirk for Marvell 4140 SATA PMP lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 028/107] libata: increase the timeout when setting transfer mode lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 043/107] Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 039/107] xhci: report U3 when link is in resume state lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 027/107] libata: force disable trim for SuperSSpeed S238 lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 033/107] inet: frags: fix defragmented packet's IP header for af_packet lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 032/107] mac80211: clear subdir_stations when removing debugfs lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 042/107] tile: use free_bootmem_late() for initrd lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 038/107] xhci: Calculate old endpoints correctly on device reset lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 025/107] libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for HP 250GB SATA disk VB0250EAVER lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 047/107] crypto: ixp4xx - Remove bogus BUG_ON on scattered dst buffer lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 045/107] mmc: block: Add missing mmc_blk_put() in power_ro_lock_show() lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 021/107] s390/process: fix sfpc inline assembly lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 041/107] usb-storage: ignore ZTE MF 823 card reader in mode 0x1225 lizf@kernel.org - 2016-03-16 09:40 +0100
[PATCH 3.4 009/107] 9p: don't leave a half-initialized inode sitting around lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 007/107] hpfs: kstrdup() out of memory handling lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 011/107] dm btree remove: fix bug in redistribute3 lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 022/107] rds: rds_ib_device.refcount overflow lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 016/107] s390/sclp: clear upper register halves in _sclp_print_early lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 002/107] fs/buffer.c: support buffer cache allocations with gfp modifiers lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 010/107] ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4 lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 023/107] st: null pointer dereference panic caused by use after kref_put by st_open lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 004/107] ext4: avoid deadlocks in the writeback path by using sb_getblk_gfp lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 014/107] USB: cp210x: add ID for Aruba Networks controllers lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 013/107] USB: option: add 2020:4000 ID lizf@kernel.org - 2016-03-16 09:50 +0100
[PATCH 3.4 018/107] rtnetlink: verify IFLA_VF_INFO attributes before passing them to driver lizf@kernel.org - 2016-03-16 09:50 +0100
Re: [PATCH 3.4 000/107] 3.4.111-rc1 review Guenter Roeck <linux@roeck-us.net> - 2016-03-16 19:00 +0100
Re: [PATCH 3.4 000/107] 3.4.111-rc1 review Zefan Li <lizefan@huawei.com> - 2016-03-17 02:30 +0100
Page 6 of 6 — ← Prev page 1 2 3 4 5 [6]
| From | lizf@kernel.org |
|---|---|
| Date | 2016-03-16 09:50 +0100 |
| Subject | [PATCH 3.4 014/107] USB: cp210x: add ID for Aruba Networks controllers |
| Message-ID | <rdfjt-6uw-35@gated-at.bofh.it> |
| In reply to | #1358614 |
From: Peter Sanford <peter@sanford.io>
3.4.111-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit f98a7aa81eeeadcad25665c3501c236d531d4382 upstream.
Add the USB serial console device ID for Aruba Networks 7xxx series
controllers which have a USB port for their serial console.
Signed-off-by: Peter Sanford <peter@sanford.io>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Zefan Li <lizefan@huawei.com>
---
drivers/usb/serial/cp210x.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 29bf383..7a04e2c 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -193,6 +193,7 @@ static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x1FB9, 0x0602) }, /* Lake Shore Model 648 Magnet Power Supply */
{ USB_DEVICE(0x1FB9, 0x0700) }, /* Lake Shore Model 737 VSM Controller */
{ USB_DEVICE(0x1FB9, 0x0701) }, /* Lake Shore Model 776 Hall Matrix */
+ { USB_DEVICE(0x2626, 0xEA60) }, /* Aruba Networks 7xxx USB Serial Console */
{ USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
{ USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */
{ USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | lizf@kernel.org |
|---|---|
| Date | 2016-03-16 09:50 +0100 |
| Subject | [PATCH 3.4 013/107] USB: option: add 2020:4000 ID |
| Message-ID | <rdfjt-6uw-39@gated-at.bofh.it> |
| In reply to | #1358614 |
From: Claudio Cappelli <claudio.cappelli.linux@gmail.com>
3.4.111-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit f6d7fb37f92622479ef6da604f27561f5045ba1e upstream.
Add device Olivetti Olicard 300 (Network Connect: MT6225) - IDs 2020:4000.
T: Bus=01 Lev=02 Prnt=04 Port=00 Cnt=01 Dev#= 10 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=2020 ProdID=4000 Rev=03.00
S: Manufacturer=Network Connect
S: Product=MT6225
C: #Ifs= 7 Cfg#= 1 Atr=a0 MxPwr=500mA
I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim
I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim
I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=02 Prot=01 Driver=option
I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#= 6 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage
Signed-off-by: Claudio Cappelli <claudio.cappelli.linux@gmail.com>
Suggested-by: Lars Melin <larsm17@gmail.com>
[johan: amend commit message with devices info ]
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Zefan Li <lizefan@huawei.com>
---
drivers/usb/serial/option.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index d8232df..cb999af 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1757,6 +1757,7 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
+ { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) }, /* OLICARD300 - MT6225 */
{ USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
{ USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) },
{ } /* Terminating entry */
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | lizf@kernel.org |
|---|---|
| Date | 2016-03-16 09:50 +0100 |
| Subject | [PATCH 3.4 018/107] rtnetlink: verify IFLA_VF_INFO attributes before passing them to driver |
| Message-ID | <rdfju-6uw-47@gated-at.bofh.it> |
| In reply to | #1358614 |
From: Daniel Borkmann <daniel@iogearbox.net>
3.4.111-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 4f7d2cdfdde71ffe962399b7020c674050329423 upstream.
Jason Gunthorpe reported that since commit c02db8c6290b ("rtnetlink: make
SR-IOV VF interface symmetric"), we don't verify IFLA_VF_INFO attributes
anymore with respect to their policy, that is, ifla_vfinfo_policy[].
Before, they were part of ifla_policy[], but they have been nested since
placed under IFLA_VFINFO_LIST, that contains the attribute IFLA_VF_INFO,
which is another nested attribute for the actual VF attributes such as
IFLA_VF_MAC, IFLA_VF_VLAN, etc.
Despite the policy being split out from ifla_policy[] in this commit,
it's never applied anywhere. nla_for_each_nested() only does basic nla_ok()
testing for struct nlattr, but it doesn't know about the data context and
their requirements.
Fix, on top of Jason's initial work, does 1) parsing of the attributes
with the right policy, and 2) using the resulting parsed attribute table
from 1) instead of the nla_for_each_nested() loop (just like we used to
do when still part of ifla_policy[]).
Reference: http://thread.gmane.org/gmane.linux.network/368913
Fixes: c02db8c6290b ("rtnetlink: make SR-IOV VF interface symmetric")
Reported-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Rony Efraim <ronye@mellanox.com>
Cc: Vlad Zolotarov <vladz@cloudius-systems.com>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Cc: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Vlad Zolotarov <vladz@cloudius-systems.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2:
- Drop unsupported attributes
- Use ndo_set_vf_tx_rate operation, not ndo_set_vf_rate]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Zefan Li <lizefan@huawei.com>
---
net/core/rtnetlink.c | 106 +++++++++++++++++++++++++--------------------------
1 file changed, 52 insertions(+), 54 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 43c6dd8..8941e962 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1139,10 +1139,6 @@ static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
[IFLA_INFO_DATA] = { .type = NLA_NESTED },
};
-static const struct nla_policy ifla_vfinfo_policy[IFLA_VF_INFO_MAX+1] = {
- [IFLA_VF_INFO] = { .type = NLA_NESTED },
-};
-
static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
[IFLA_VF_MAC] = { .len = sizeof(struct ifla_vf_mac) },
[IFLA_VF_VLAN] = { .len = sizeof(struct ifla_vf_vlan) },
@@ -1216,58 +1212,53 @@ static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])
return 0;
}
-static int do_setvfinfo(struct net_device *dev, struct nlattr *attr)
+static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)
{
- int rem, err = -EINVAL;
- struct nlattr *vf;
const struct net_device_ops *ops = dev->netdev_ops;
+ int err = -EINVAL;
- nla_for_each_nested(vf, attr, rem) {
- switch (nla_type(vf)) {
- case IFLA_VF_MAC: {
- struct ifla_vf_mac *ivm;
- ivm = nla_data(vf);
- err = -EOPNOTSUPP;
- if (ops->ndo_set_vf_mac)
- err = ops->ndo_set_vf_mac(dev, ivm->vf,
- ivm->mac);
- break;
- }
- case IFLA_VF_VLAN: {
- struct ifla_vf_vlan *ivv;
- ivv = nla_data(vf);
- err = -EOPNOTSUPP;
- if (ops->ndo_set_vf_vlan)
- err = ops->ndo_set_vf_vlan(dev, ivv->vf,
- ivv->vlan,
- ivv->qos);
- break;
- }
- case IFLA_VF_TX_RATE: {
- struct ifla_vf_tx_rate *ivt;
- ivt = nla_data(vf);
- err = -EOPNOTSUPP;
- if (ops->ndo_set_vf_tx_rate)
- err = ops->ndo_set_vf_tx_rate(dev, ivt->vf,
- ivt->rate);
- break;
- }
- case IFLA_VF_SPOOFCHK: {
- struct ifla_vf_spoofchk *ivs;
- ivs = nla_data(vf);
- err = -EOPNOTSUPP;
- if (ops->ndo_set_vf_spoofchk)
- err = ops->ndo_set_vf_spoofchk(dev, ivs->vf,
- ivs->setting);
- break;
- }
- default:
- err = -EINVAL;
- break;
- }
- if (err)
- break;
+ if (tb[IFLA_VF_MAC]) {
+ struct ifla_vf_mac *ivm = nla_data(tb[IFLA_VF_MAC]);
+ err = -EOPNOTSUPP;
+ if (ops->ndo_set_vf_mac)
+ err = ops->ndo_set_vf_mac(dev, ivm->vf,
+ ivm->mac);
+ if (err < 0)
+ return err;
}
+
+ if (tb[IFLA_VF_VLAN]) {
+ struct ifla_vf_vlan *ivv = nla_data(tb[IFLA_VF_VLAN]);
+
+ err = -EOPNOTSUPP;
+ if (ops->ndo_set_vf_vlan)
+ err = ops->ndo_set_vf_vlan(dev, ivv->vf, ivv->vlan,
+ ivv->qos);
+ if (err < 0)
+ return err;
+ }
+
+ if (tb[IFLA_VF_TX_RATE]) {
+ struct ifla_vf_tx_rate *ivt = nla_data(tb[IFLA_VF_TX_RATE]);
+
+ if (ops->ndo_set_vf_tx_rate)
+ err = ops->ndo_set_vf_tx_rate(dev, ivt->vf,
+ ivt->rate);
+ if (err < 0)
+ return err;
+ }
+
+ if (tb[IFLA_VF_SPOOFCHK]) {
+ struct ifla_vf_spoofchk *ivs = nla_data(tb[IFLA_VF_SPOOFCHK]);
+
+ err = -EOPNOTSUPP;
+ if (ops->ndo_set_vf_spoofchk)
+ err = ops->ndo_set_vf_spoofchk(dev, ivs->vf,
+ ivs->setting);
+ if (err < 0)
+ return err;
+ }
+
return err;
}
@@ -1450,14 +1441,21 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
}
if (tb[IFLA_VFINFO_LIST]) {
+ struct nlattr *vfinfo[IFLA_VF_MAX + 1];
struct nlattr *attr;
int rem;
+
nla_for_each_nested(attr, tb[IFLA_VFINFO_LIST], rem) {
- if (nla_type(attr) != IFLA_VF_INFO) {
+ if (nla_type(attr) != IFLA_VF_INFO ||
+ nla_len(attr) < NLA_HDRLEN) {
err = -EINVAL;
goto errout;
}
- err = do_setvfinfo(dev, attr);
+ err = nla_parse_nested(vfinfo, IFLA_VF_MAX, attr,
+ ifla_vf_policy);
+ if (err < 0)
+ goto errout;
+ err = do_setvfinfo(dev, vfinfo);
if (err < 0)
goto errout;
modified = 1;
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2016-03-16 19:00 +0100 |
| Message-ID | <rdnTI-3JO-11@gated-at.bofh.it> |
| In reply to | #1358614 |
On Wed, Mar 16, 2016 at 04:05:41PM +0800, lizf@kernel.org wrote: > From: Zefan Li <lizefan@huawei.com> > > This is the start of the stable review cycle for the 3.4.111 release. > There are 107 patches in this series, all will be posted as a response > to this one. If anyone has any issues with these being applied, please > let me know. > > Responses should be made by Wed Mar 16 16:04:10 CST 2016. > Anything received after that time might be too late. > Build results: total: 98 pass: 98 fail: 0 Qemu test results: total: 63 pass: 63 fail: 0 Details are available at http://kerneltests.org/builders. Guenter
[toc] | [prev] | [next] | [standalone]
| From | Zefan Li <lizefan@huawei.com> |
|---|---|
| Date | 2016-03-17 02:30 +0100 |
| Message-ID | <rduVb-ne-3@gated-at.bofh.it> |
| In reply to | #1359204 |
On 2016/3/17 1:51, Guenter Roeck wrote: > On Wed, Mar 16, 2016 at 04:05:41PM +0800, lizf@kernel.org wrote: >> From: Zefan Li <lizefan@huawei.com> >> >> This is the start of the stable review cycle for the 3.4.111 release. >> There are 107 patches in this series, all will be posted as a response >> to this one. If anyone has any issues with these being applied, please >> let me know. >> >> Responses should be made by Wed Mar 16 16:04:10 CST 2016. >> Anything received after that time might be too late. >> > Build results: > total: 98 pass: 98 fail: 0 > Qemu test results: > total: 63 pass: 63 fail: 0 > > Details are available at http://kerneltests.org/builders. > Thanks for testing!
[toc] | [prev] | [standalone]
Page 6 of 6 — ← Prev page 1 2 3 4 5 [6]
Back to top | Article view | linux.kernel
csiph-web