| Message ID | ca25f9904d2a4acebdc02b1c054aaeab25d99cc5.1643698195.git.antony.antony@secunet.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | xfrm: fix the if_id check in changelink | expand |
On Tue, Feb 01, 2022 at 07:51:57AM +0100, Antony Antony wrote: > if_id will be always 0, because it was not yet initialized. > > Fixes: 8dce43919566 ("xfrm: interface with if_id 0 should return error") > Reported-by: Pavel Machek <pavel@denx.de> > Signed-off-by: Antony Antony <antony.antony@secunet.com> > --- > net/xfrm/xfrm_interface.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly. </formletter>
On Tue, Feb 01, 2022 at 07:51:57AM +0100, Antony Antony wrote: > if_id will be always 0, because it was not yet initialized. > > Fixes: 8dce43919566 ("xfrm: interface with if_id 0 should return error") > Reported-by: Pavel Machek <pavel@denx.de> > Signed-off-by: Antony Antony <antony.antony@secunet.com> Applied, thanks a lot Antony!
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index 57448fc519fc..4e3c62d1ad9e 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -673,12 +673,12 @@ static int xfrmi_changelink(struct net_device *dev, struct nlattr *tb[], struct net *net = xi->net; struct xfrm_if_parms p = {}; + xfrmi_netlink_parms(data, &p); if (!p.if_id) { NL_SET_ERR_MSG(extack, "if_id must be non zero"); return -EINVAL; } - xfrmi_netlink_parms(data, &p); xi = xfrmi_locate(net, &p); if (!xi) { xi = netdev_priv(dev);
if_id will be always 0, because it was not yet initialized. Fixes: 8dce43919566 ("xfrm: interface with if_id 0 should return error") Reported-by: Pavel Machek <pavel@denx.de> Signed-off-by: Antony Antony <antony.antony@secunet.com> --- net/xfrm/xfrm_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2