Commit 90de546d authored by Liang He's avatar Liang He Committed by David S. Miller
Browse files

ethernet: sun: add check for the mdesc_grab() 



In vnet_port_probe() and vsw_port_probe(), we should
check the return value of mdesc_grab() as it may
return NULL which can caused NPD bugs.

Fixes: 5d01fa0c ("ldmvsw: Add ldmvsw.c driver code")
Fixes: 43fdf274 ("[SPARC64]: Abstract out mdesc accesses for better MD update handling.")
Signed-off-by: default avatarLiang He <windhl@126.com>
Reviewed-by: default avatarPiotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c98b8bc

drivers/net/ethernet/sun/ldmvsw.c

+3 −0
Original line number Diff line number Diff line
@@ -287,6 +287,9 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) 


	hp = mdesc_grab();



	if (!hp)

		return -ENODEV;



	rmac = mdesc_get_property(hp, vdev->mp, remote_macaddr_prop, &len);

	err = -ENODEV;

	if (!rmac) {

drivers/net/ethernet/sun/sunvnet.c

+3 −0
Original line number Diff line number Diff line
@@ -433,6 +433,9 @@ static int vnet_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) 


	hp = mdesc_grab();



	if (!hp)

		return -ENODEV;



	vp = vnet_find_parent(hp, vdev->mp, vdev);

	if (IS_ERR(vp)) {

		pr_err("Cannot find port parent vnet\n");