To add to the other answers, Smaug in the Hobbit has four legs and two wings. Not two legs. That's just an invention of the movie makers. Tolkein makes that clear in this sketch:
(death of Smaug)
So Smaug at least was a dragon, not a wyvern in the original book.
All these paintings are by the author himself, so can't doubt that he thought of his dragons as having four legs in addition to wings.
For a modern example, the dragons in "How to train your Dragon" and its sequels and long running TV children's series on CBBC are a mixture of wyverns and dragons.
For instance Hiccup's black dragon Toothless, in the center has four legs while Astrid's blue dragon Stormfly (changes colour depending on its mood) has two legs so is a wyvern.